Merge pull request #3 from smoors/pr_to_pr205

remove msg and reduce number of subdirs

eessi/testsuite/tests/apps/cp2k/cp2k.py

@@ -1,5 +1,3 @@
-import os
-
 import reframe as rfm
 from reframe.core.builtins import parameter, run_after, performance_function, sanity_function, fixture
 import reframe.utility.sanity as sn
@@ -47,10 +45,7 @@ def set_bench_name(self):
 
     @run_after('setup')
     def prepare_test(self):
-        # self.prerun_cmds = [
-        #    f'cp {os.path.join(os.path.dirname(__file__), "input", self.bench_name)}.inp ./'
-        # ]
-        self.executable_opts += ['-i', f'{self.stage_files.stagedir}/input/QS/{os.path.basename(self.bench_name)}.inp']
+        self.executable_opts += ['-i', f'{self.stage_files.stagedir}/{self.bench_name}.inp']
 
     @sanity_function
     def assert_energy(self):

eessi/testsuite/tests/apps/cp2k/cp2k_staging/cp2k_stage_input.py

@@ -13,12 +13,12 @@ class EESSI_CP2K_stage_input(rfm.RunOnlyRegressionTest):
 
     # Check that all files have been staged correctly
     input_file_list = [
-        'input/QS/H2O-32.inp',
-        'input/QS/H2O-128.inp',
-        'input/QS/H2O-512.inp'
+        'QS/H2O-32.inp',
+        'QS/H2O-128.inp',
+        'QS/H2O-512.inp',
     ]
     sn_list = [sn.assert_found('.*', input_file) for input_file in input_file_list]
-    msg = "input file '%s' seems to be missing"
     sanity_patterns = sn.all([
-        sn.assert_found('.*', input_file, msg % input_file) for input_file in input_file_list
+        sn.assert_found('.*', input_file, f"input file '{input_file}' seems to be missing")
+        for input_file in input_file_list
     ])