From e06709af7630f9cd15e274203f75396c9d120e01 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Thu, 22 Jun 2017 10:55:22 +0200
Subject: [PATCH] Reshuffle test to avoid race condition
---
examples/AlignDet/CMakeLists.txt | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 920df9e34..10d51bf8b 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -76,16 +76,6 @@ dd4hep_add_test_reg( AlignDet_Telescope_write_xml
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
#
-#---Testing: Load Telescope geometry and read and print alignments --------
-dd4hep_add_test_reg( AlignDet_Telescope_readback_xml
- COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_AlignmentExample_read_xml
- -input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
- -deltas file:./new_cond.xml
- REGEX_PASS "33 conditions in slice. \\(T:33,S:33,L:0,C:0,M:0\\) Alignments accessed: 20 \\(A:19,M:0\\) for IOV:run\\(1\\)"
- REGEX_FAIL " ERROR ;EXCEPTION;Exception"
- )
-#
#---Testing: Simple stress: Load Telescope geometry and have multiple runs on IOVs
dd4hep_add_test_reg( AlignDet_Telescope_stress
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
@@ -114,6 +104,16 @@ dd4hep_add_test_reg( AlignDet_Telescope_align_nominal
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
#
+#---Testing: Load Telescope geometry and read and print alignments --------
+dd4hep_add_test_reg( AlignDet_Telescope_readback_xml
+ COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
+ EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_AlignmentExample_read_xml
+ -input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
+ -deltas file:./new_cond.xml
+ REGEX_PASS "33 conditions in slice. \\(T:33,S:33,L:0,C:0,M:0\\) Alignments accessed: 20 \\(A:19,M:0\\) for IOV:run\\(1\\)"
+ REGEX_FAIL " ERROR ;EXCEPTION;Exception"
+ )
+#
#---Testing: Extended stress: Load CLICSiD geometry and have multiple runs on IOVs
dd4hep_add_test_reg( AlignDet_CLICSiD_stress_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
--
GitLab