From 68c7728f30cac04a973bc910ddf0af1652d72d53 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Thu, 9 Jan 2025 15:33:07 -0700 Subject: [PATCH 1/2] Test fixes --- test/test_files/amr-nalu-cylinder-motion/cylinder-amr.inp | 2 -- test/test_files/amr-nalu-cylinder/cylinder-amr.inp | 2 -- test/test_files/hybrid-multi-cylinder/cylinder-amr.inp | 2 -- 3 files changed, 6 deletions(-) diff --git a/test/test_files/amr-nalu-cylinder-motion/cylinder-amr.inp b/test/test_files/amr-nalu-cylinder-motion/cylinder-amr.inp index 6514844..40eedf9 100644 --- a/test/test_files/amr-nalu-cylinder-motion/cylinder-amr.inp +++ b/test/test_files/amr-nalu-cylinder-motion/cylinder-amr.inp @@ -7,8 +7,6 @@ time.fixed_dt = 0.15 time.cfl = 1.0 time.plot_interval = 10 time.checkpoint_interval = -1 -io.plot_file = out/plt -io.check_file = out/chk # PHYSICS # #.......................................# incflo.gravity = 0. 0. 0.0 # Gravitational force (3D) diff --git a/test/test_files/amr-nalu-cylinder/cylinder-amr.inp b/test/test_files/amr-nalu-cylinder/cylinder-amr.inp index 6514844..40eedf9 100644 --- a/test/test_files/amr-nalu-cylinder/cylinder-amr.inp +++ b/test/test_files/amr-nalu-cylinder/cylinder-amr.inp @@ -7,8 +7,6 @@ time.fixed_dt = 0.15 time.cfl = 1.0 time.plot_interval = 10 time.checkpoint_interval = -1 -io.plot_file = out/plt -io.check_file = out/chk # PHYSICS # #.......................................# incflo.gravity = 0. 0. 0.0 # Gravitational force (3D) diff --git a/test/test_files/hybrid-multi-cylinder/cylinder-amr.inp b/test/test_files/hybrid-multi-cylinder/cylinder-amr.inp index 629f427..6427fee 100644 --- a/test/test_files/hybrid-multi-cylinder/cylinder-amr.inp +++ b/test/test_files/hybrid-multi-cylinder/cylinder-amr.inp @@ -7,8 +7,6 @@ time.fixed_dt = 0.15 time.cfl = 1.0 time.plot_interval = 10 time.checkpoint_interval = -1 -io.plot_file = out/plt -io.check_file = out/chk # PHYSICS # #.......................................# incflo.gravity = 0. 0. 0.0 # Gravitational force (3D) From 28890401ccd0c2d8164dff03a115b44fe40ddde3 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Thu, 9 Jan 2025 16:01:02 -0700 Subject: [PATCH 2/2] pipefail --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 31119b4..940946c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -65,7 +65,7 @@ endmacro(setup_test) # Standard regression test function(add_test_r TEST_NAME) setup_test() - add_test(${TEST_NAME} sh -c "${MPI_COMMANDS} ${CMAKE_BINARY_DIR}/${EXAWIND_EXE_NAME} ${MPIEXEC_POSTFLAGS} ${CURRENT_TEST_BINARY_DIR}/${TEST_NAME}.yaml 2>&1 | tee ${TEST_NAME}.log ${SAVE_GOLDS_COMMAND} ${FCOMPARE_COMMAND}") + add_test(${TEST_NAME} bash -c "set -o pipefail && ${MPI_COMMANDS} ${CMAKE_BINARY_DIR}/${EXAWIND_EXE_NAME} ${MPIEXEC_POSTFLAGS} ${CURRENT_TEST_BINARY_DIR}/${TEST_NAME}.yaml 2>&1 | tee ${TEST_NAME}.log ${SAVE_GOLDS_COMMAND} ${FCOMPARE_COMMAND}") # Set properties for test set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 5400