Merge branch 'fix-race-cond' into 'master'

[T] Fix race condition on new AddLayer ctests. See merge request ogs/ogs!5064
ufz · Aug 7, 2024 · eef1a5e · eef1a5e
2 parents c91123c + ed4e99c
commit eef1a5e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git 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}/<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
@@ -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
@@ -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
@@ -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"