From 9f6d9df30297db1c554a9e5aace75fc2a494fbbe Mon Sep 17 00:00:00 2001
From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Date: Sun, 28 May 2023 01:46:23 -0700
Subject: patchelf: convert to new stand-alone test process (#37831)

---
 .../repos/builtin/packages/patchelf/package.py     | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py
index 2aaf627cf7..b021a07ac8 100644
--- a/var/spack/repos/builtin/packages/patchelf/package.py
+++ b/var/spack/repos/builtin/packages/patchelf/package.py
@@ -56,29 +56,20 @@ class Patchelf(AutotoolsPackage):
             )
         )
 
-    def test(self):
+    def test_version(self):
+        """ensure patchelf version match"""
         # Check patchelf in prefix and reports the correct version
-        reason = "test: ensuring patchelf version is {0}".format(self.spec.version)
-        self.run_test(
-            "patchelf",
-            options="--version",
-            expected=["patchelf %s" % self.spec.version],
-            installed=True,
-            purpose=reason,
-        )
+        patchelf = which(self.prefix.bin.patchelf)
+        out = patchelf("--version", output=str.split, error=str.split)
+        expected = f"patchelf {self.spec.version}"
+        assert expected in out, f"Expected '{expected}' in output"
 
-        # Check the rpath is changed
+    def test_rpath_change(self):
+        """ensure patchelf can change rpath"""
         currdir = os.getcwd()
         hello_file = self.test_suite.current_test_data_dir.join("hello")
-        self.run_test(
-            "patchelf",
-            ["--set-rpath", currdir, hello_file],
-            purpose="test: ensuring that patchelf can change rpath",
-        )
 
-        self.run_test(
-            "patchelf",
-            options=["--print-rpath", hello_file],
-            expected=[currdir],
-            purpose="test: ensuring that patchelf changed rpath",
-        )
+        patchelf = which(self.prefix.bin.patchelf)
+        patchelf("--set-rpath", currdir, hello_file)
+        out = patchelf("--print-rpath", hello_file, output=str.split, error=str.split)
+        assert currdir in out, f"Expected '{currdir}' in output"
-- 
cgit v1.2.3-70-g09d2