Skip to content

Commit

Permalink
[T] Fix race condition on new AddLayer ctests.
Browse files Browse the repository at this point in the history
Tests have to write to different output files when running concurrently.
  • Loading branch information
bilke committed Aug 7, 2024
1 parent fc4d513 commit ed4e99c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Applications/Utils/Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1495,10 +1495,10 @@ AddTest(
--add-layer-on-bottom
-t 10
--set-material-id 10
-o ${Data_BINARY_DIR}/<PATH>/SmallTest_WithAdditionalBottomLayer.vtu
-o ${Data_BINARY_DIR}/<PATH>/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
Expand All @@ -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}/<PATH>/SmallTest_WithAdditionalBottomLayer.vtu
-o ${Data_BINARY_DIR}/<PATH>/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
Expand All @@ -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}/<PATH>/SmallTest_WithAdditionalBottomLayer.vtu
-o ${Data_BINARY_DIR}/<PATH>/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
Expand All @@ -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}/<PATH>/SmallTest_WithAdditionalBottomLayer.vtu
-o ${Data_BINARY_DIR}/<PATH>/SmallTest_WithAdditionalBottomLayer_failing.vtu
REQUIREMENTS NOT (OGS_USE_MPI)
PROPERTIES
PASS_REGULAR_EXPRESSION "It is not possible to set both options"
Expand Down

0 comments on commit ed4e99c

Please sign in to comment.