From 168849d6f9ec79175df626e45ff83d26eb401234 Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Wed, 28 Jul 2021 11:47:03 +0200 Subject: [PATCH 1/2] Test main branch instead of develop --- cscs-checks/prgenv/hip/build_hip.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cscs-checks/prgenv/hip/build_hip.py b/cscs-checks/prgenv/hip/build_hip.py index 91c9297765..abf4156c9b 100644 --- a/cscs-checks/prgenv/hip/build_hip.py +++ b/cscs-checks/prgenv/hip/build_hip.py @@ -21,6 +21,7 @@ class BuildHip(rfm.RegressionTest): valid_prog_environs = ['PrgEnv-gnu'] sourcesdir = 'https://github.com/ROCm-Developer-Tools/HIP.git' build_system = 'CMake' + prebuild_cmds = ['git checkout main'] postbuild_cmds = ['make install'] executable = f'{hip_path}/bin/hipcc' executable_opts = ['--version'] From 0b43dfe28c1c643ff2a4a359cfb6962024ac9dd6 Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Wed, 28 Jul 2021 13:52:36 +0200 Subject: [PATCH 2/2] Bump test syntax --- cscs-checks/prgenv/hip/build_hip.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cscs-checks/prgenv/hip/build_hip.py b/cscs-checks/prgenv/hip/build_hip.py index abf4156c9b..cb5f90a914 100644 --- a/cscs-checks/prgenv/hip/build_hip.py +++ b/cscs-checks/prgenv/hip/build_hip.py @@ -39,9 +39,9 @@ def set_compile_options(self): f'-DHIP_PLATFORM={self.hip_platform}', ] - @run_before('sanity') + @sanity_function def set_sanity_patterns(self): - self.sanity_patterns = sn.assert_found(r'nvcc:\s+NVIDIA', self.stdout) + return sn.assert_found(r'nvcc:\s+NVIDIA', self.stdout) @rfm.simple_test @@ -76,6 +76,6 @@ def set_env(self): self.variables = {'HIP_PATH': f'{self.hip_path}'} self.build_system.cxx = os.path.join(self.hip_path, 'bin', 'hipcc') - @run_before('sanity') + @sanity_function def set_sanity(self): - self.sanity_patterns = sn.assert_found(r'HelloWorld', self.stdout) + return sn.assert_found(r'HelloWorld', self.stdout)