Merge pull request #581 from teojgo/regression_test/libsci_acc_compute_nodes

[test] Run libsci_acc and libsci_resolve tests on compute nodes as well

Author: vkarak

cscs-checks/compile/libsci_acc_symlink.py

@@ -1,36 +1,27 @@
 import os
 
+import reframe as rfm
 import reframe.utility.sanity as sn
-from reframe.core.pipeline import RunOnlyRegressionTest
 
 
-class LibSciAccSymLinkTest(RunOnlyRegressionTest):
-    def __init__(self, lib_name, **kwargs):
-        super().__init__(lib_name.replace('.so', '_symlink_check'),
-                         os.path.dirname(__file__), **kwargs)
-
+@rfm.parameterized_test(['libsci_acc_gnu_49_nv20'],
+                        ['libsci_acc_gnu_49_nv35'],
+                        ['libsci_acc_gnu_49_nv60'],
+                        ['libsci_acc_cray_nv20_openacc'],
+                        ['libsci_acc_cray_nv35_openacc'],
+                        ['libsci_acc_cray_nv60_openacc'])
+class LibSciAccSymLinkTest(rfm.RunOnlyRegressionTest):
+    def __init__(self, lib_name):
+        super().__init__()
         self.descr = 'LibSciAcc symlink check of %s' % lib_name
-        self.valid_systems = ['daint:login', 'dom:login']
+        self.valid_systems = ['daint:login', 'daint:gpu',
+                              'dom:login', 'dom:gpu']
 
         # The prgenv is irrelevant for this case, so just chose one
         self.valid_prog_environs = ['PrgEnv-cray']
-
         self.executable = 'ls'
-        self.executable_opts = '-al /opt/cray/pe/lib64/libsci_a*'.split()
-        self.sanity_patterns = sn.assert_found(lib_name, self.stdout)
+        self.executable_opts = ['-al', '/opt/cray/pe/lib64/libsci_a*']
+        self.sanity_patterns = sn.assert_found(lib_name + '.so', self.stdout)
+
         self.maintainers = ['AJ']
         self.tags = {'production'}
-
-
-def _get_checks(**kwargs):
-
-    ret = []
-    for lib_name in [r'libsci_acc_gnu_49_nv20.so',
-                     r'libsci_acc_gnu_49_nv35.so',
-                     r'libsci_acc_gnu_49_nv60.so',
-                     r'libsci_acc_cray_nv20_openacc.so',
-                     r'libsci_acc_cray_nv35_openacc.so',
-                     r'libsci_acc_cray_nv60_openacc.so']:
-        ret.append(LibSciAccSymLinkTest(lib_name, **kwargs))
-
-    return ret

cscs-checks/compile/libsci_resolve.py

@@ -7,7 +7,8 @@ def __init__(self):
         super().__init__()
         self.sourcesdir = 'src/libsci_resolve'
         self.sourcepath = 'libsci_resolve.f90'
-        self.valid_systems = ['daint:login', 'dom:login']
+        self.valid_systems = ['daint:login', 'daint:gpu',
+                              'dom:login', 'dom:gpu']
         self.modules = ['craype-haswell']
         self.maintainers = ['AJ']
         self.tags = {'production'}