From 6a13ebf4af4c3d988dc91da998f7460605e0bbbc Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 9 Aug 2021 11:24:44 +0200
Subject: [PATCH 1/2] Use `name` instead of `executable` in postbuild cmds

---
 cscs-checks/compile/libsci_resolve.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cscs-checks/compile/libsci_resolve.py b/cscs-checks/compile/libsci_resolve.py
index 2d5f2f8a5f..0a14a28a5d 100644
--- a/cscs-checks/compile/libsci_resolve.py
+++ b/cscs-checks/compile/libsci_resolve.py
@@ -18,7 +18,7 @@ class LibSciResolveBaseTest(rfm.CompileOnlyRegressionTest):
 
     @run_after('setup')
     def set_postbuild_cmds(self):
-        self.postbuild_cmds = [f'readelf -d {self.executable}']
+        self.postbuild_cmds = [f'readelf -d {self.name}']
 
 
 @rfm.simple_test
@@ -41,8 +41,8 @@ def update_tags(self):
     def set_modules(self):
         self.modules += [f'craype-accel-nvidia{self.accel_nvidia_version}']
 
-    @run_before('sanity')
-    def set_sanity(self):
+    @sanity_function
+    def libsci_acc_resolve(self):
         # here lib_name is in the format: libsci_acc_gnu_48_nv35.so or
         #                                 libsci_acc_cray_nv35.so
         regex = (r'.*\(NEEDED\).*libsci_acc_(?P<prgenv>[A-Za-z]+)_'
@@ -56,7 +56,7 @@ def set_sanity(self):
             cver_sanity = sn.assert_eq(
                 sn.extractsingle(regex, self.stdout, 'cver'), cver)
 
-        self.sanity_patterns = sn.all([
+        return sn.all([
             sn.assert_eq(
                 sn.extractsingle(regex, self.stdout, 'prgenv'), prgenv),
             cver_sanity,
@@ -83,11 +83,11 @@ def cdt_2105_workaround(self):
                 '-L/opt/intel/oneapi/mkl/latest/lib/intel64/'
             ]
 
-    @run_before('sanity')
-    def set_sanity(self):
+    @sanity_function
+    def libmkl_resolve(self):
         regex = (r'.*\(NEEDED\).*libmkl_(?P<prgenv>[A-Za-z]+)_(?P<version>\S+)'
                  r'\.so')
-        self.sanity_patterns = sn.all([
+        return sn.all([
             sn.assert_eq(
                 sn.extractsingle(regex, self.stdout, 'prgenv'), 'intel'),
             sn.assert_eq(

From 562176acf83ac090f8a791bd7e1bdc45fe8526b8 Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 9 Aug 2021 11:48:24 +0200
Subject: [PATCH 2/2] Explicitly set the `executable` in the base class

---
 cscs-checks/compile/libsci_resolve.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cscs-checks/compile/libsci_resolve.py b/cscs-checks/compile/libsci_resolve.py
index 0a14a28a5d..52e5935929 100644
--- a/cscs-checks/compile/libsci_resolve.py
+++ b/cscs-checks/compile/libsci_resolve.py
@@ -11,6 +11,7 @@
 class LibSciResolveBaseTest(rfm.CompileOnlyRegressionTest):
     sourcesdir = 'src/libsci_resolve'
     sourcepath = 'libsci_resolve.f90'
+    executable = 'libsciresolve.x'
     valid_systems = ['daint:login', 'daint:gpu', 'dom:login', 'dom:gpu']
     modules = ['craype-haswell']
     maintainers = ['AJ', 'LM']
@@ -18,7 +19,7 @@ class LibSciResolveBaseTest(rfm.CompileOnlyRegressionTest):
 
     @run_after('setup')
     def set_postbuild_cmds(self):
-        self.postbuild_cmds = [f'readelf -d {self.name}']
+        self.postbuild_cmds = [f'readelf -d {self.executable}']
 
 
 @rfm.simple_test