From ed4e99cf2ed51e2a9b43cb4b97fc6f840fa811ed Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Wed, 7 Aug 2024 09:51:02 +0200 Subject: [PATCH] [T] Fix race condition on new AddLayer ctests. Tests have to write to different output files when running concurrently. --- Applications/Utils/Tests.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake index 208376de954..e4509187dbf 100644 --- a/Applications/Utils/Tests.cmake +++ b/Applications/Utils/Tests.cmake @@ -1495,10 +1495,10 @@ AddTest( --add-layer-on-bottom -t 10 --set-material-id 10 - -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer.vtu + -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer_id.vtu REQUIREMENTS NOT (OGS_USE_MPI) TESTER vtkdiff-mesh - DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer.vtu 1.e-16 + DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer_id.vtu 1.e-16 ) AddTest( # with option --copy-material_ids instead of --set-material-id @@ -1510,10 +1510,10 @@ AddTest( # with option --copy-material_ids instead of --set-material-id --add-layer-on-bottom -t 10 --copy-material-ids - -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer.vtu + -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer_copy.vtu REQUIREMENTS NOT (OGS_USE_MPI) TESTER vtkdiff-mesh - DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer.vtu 1.e-16 + DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer_copy.vtu 1.e-16 ) AddTest( # without options --copy-material_ids and --set-material-id @@ -1524,10 +1524,10 @@ AddTest( # without options --copy-material_ids and --set-material-id EXECUTABLE_ARGS -i SmallTest.vtu --add-layer-on-bottom -t 10 - -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer.vtu + -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer_no_opt.vtu REQUIREMENTS NOT (OGS_USE_MPI) TESTER vtkdiff-mesh - DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer.vtu 1.e-16 + DIFF_DATA SmallTest_WithAdditionalBottomLayer.vtu SmallTest_WithAdditionalBottomLayer_no_opt.vtu 1.e-16 ) AddTest( # with options --copy-material_ids and --set-material-id 10 should fail NAME AddLayer_test_set-material-id_and_copy-material-ids_failing @@ -1539,7 +1539,7 @@ AddTest( # with options --copy-material_ids and --set-material-id 10 should fail -t 10 --set-material-id 10 --copy-material-ids - -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer.vtu + -o ${Data_BINARY_DIR}//SmallTest_WithAdditionalBottomLayer_failing.vtu REQUIREMENTS NOT (OGS_USE_MPI) PROPERTIES PASS_REGULAR_EXPRESSION "It is not possible to set both options"