Skip to content

Commit bd92a98

Browse files
committed
Fix CTest support template and script
* Added build_only = False when SLURM_JOB_ID is set in os.environ within omega_ctest.py * Updated paths to the mesh NetCDF files in the build/test script template
1 parent 39124e0 commit bd92a98

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

utils/omega/ctest/build_and_ctest.template

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@ cmake \
5050

5151
./omega_build.sh
5252

53-
cd test
54-
55-
ln -sfn {{ omega_mesh_filename }} OmegaMesh.nc
56-
ln -sfn {{ omega_planar_mesh_filename }} OmegaPlanarMesh.nc
57-
ln -sfn {{ omega_sphere_mesh_filename }} OmegaSphereMesh.nc
53+
ln -sfn {{ omega_mesh_filename }} test/OmegaMesh.nc
54+
ln -sfn {{ omega_planar_mesh_filename }} test/OmegaPlanarMesh.nc
55+
ln -sfn {{ omega_sphere_mesh_filename }} test/OmegaSphereMesh.nc
5856

5957
{%- if run_ctest %}
6058
./omega_ctest.sh

utils/omega/ctest/omega_ctest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ def main():
220220
if 'SLURM_JOB_ID' in os.environ:
221221
# already on a comptue node so we will just run ctests directly
222222
submit = False
223+
build_only = False
223224
else:
224225
build_only = True
225226

0 commit comments

Comments
 (0)