From 63981b7b0ed22cf2772214a03ce3d648fb6ab653 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 25 Sep 2019 12:53:59 +0200
Subject: [PATCH] fix tests to use executable in bin
---
cmake/run_test.sh | 3 +++
cmake/run_test_package.sh | 2 +-
examples/CLICSiD/CMakeLists.txt | 9 +++------
examples/ClientTests/CMakeLists.txt | 11 +++++------
examples/DDG4_MySensDet/CMakeLists.txt | 5 +++--
examples/LHeD/CMakeLists.txt | 2 ++
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cmake/run_test.sh b/cmake/run_test.sh
index fa8772271..aed7ac0a2 100755
--- a/cmake/run_test.sh
+++ b/cmake/run_test.sh
@@ -20,5 +20,8 @@ for i in "$@" ; do
theargs="${theargs} $i"
fi
done
+
+echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
+
echo "---running test : '" ${command} ${theargs} "'"
${command} ${theargs}
diff --git a/cmake/run_test_package.sh b/cmake/run_test_package.sh
index 00d8e47fd..443f25896 100755
--- a/cmake/run_test_package.sh
+++ b/cmake/run_test_package.sh
@@ -20,7 +20,7 @@ for i in "$@" ; do
fi
done
-#echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
+echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
echo " ### running test : '${command} ${theargs}'"
exec ${command} ${theargs}
diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt
index f0500edfc..86a3b7c65 100644
--- a/examples/CLICSiD/CMakeLists.txt
+++ b/examples/CLICSiD/CMakeLists.txt
@@ -60,16 +60,14 @@ endforeach()
# ROOT Geometry overlap checks
dd4hep_add_test_reg( CLICSiD_check_geometry_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/checkGeometry.py
- --compact=file:$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
+ EXEC_ARGS checkGeometry --compact=file:$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
# This takes too long --full=true --ntracks=10 --option=o --vx=0 --vy=0 --vz=0
REGEX_PASS " Execution finished..." )
#
# ROOT Geometry overlap checks
dd4hep_add_test_reg( CLICSiD_check_overlaps_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/checkOverlaps.py
- --compact=file:$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
+ EXEC_ARGS checkOverlaps --compact=file:$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
--tolerance=0.1
REGEX_PASS " Execution finished..." )
#
@@ -141,8 +139,7 @@ if (DD4HEP_USE_GEANT4)
# Material scan
dd4hep_add_test_reg( CLICSiD_DDG4_g4material_scan_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/g4MaterialScan.py
- --compact=$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
+ EXEC_ARGS g4MaterialScan --compact=$ENV{DD4hepINSTALL}/DDDetectors/compact/SiD.xml
"--position=0,0,0" "--direction=0,1,0"
REGEX_PASS " Terminate Geant4 and delete associated actions." )
#
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index efd651a6a..0bea93d2f 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -45,6 +45,8 @@ dd4hep_install_dir( compact scripts ref DESTINATION ${ClientTestsEx_INSTALL} )
#--------------------------------------------------------------------------
dd4hep_configure_scripts( ClientTests DEFAULT_SETUP WITH_TESTS)
+enable_testing ()
+include(CTest)
#--- Testing ------------------------------------------------------------
#
# Test Volume scanner for CMS
@@ -252,8 +254,7 @@ foreach (test Assemblies BoxTrafos CaloEndcapReflection LheD_tracker MagnetField
if (DD4HEP_USE_GEANT4)
dd4hep_add_test_reg( ClientTests_g4material_scan_${test}_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/g4MaterialScan.py
- --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
+ EXEC_ARGS g4MaterialScan --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
"--position=0,0,0" "--direction=0,1,0"
REGEX_PASS " Terminate Geant4 and delete associated actions." )
endif(DD4HEP_USE_GEANT4)
@@ -274,16 +275,14 @@ foreach (test BoxTrafos CaloEndcapReflection IronCylinder MiniTel SiliconBlock N
# ROOT Geometry checks
dd4hep_add_test_reg( ClientTests_check_geometry_${test}_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/checkGeometry.py
- --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
+ EXEC_ARGS checkGeometry --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
--full=true --ntracks=10
REGEX_PASS " Execution finished..." )
#
# ROOT Geometry overlap checks
dd4hep_add_test_reg( ClientTests_check_overlaps_${test}_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/checkOverlaps.py
- --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
+ EXEC_ARGS checkOverlaps --compact=file:${ClientTestsEx_INSTALL}/compact/${test}.xml
--tolerance=0.1
REGEX_PASS " Execution finished..." )
endforeach()
diff --git a/examples/DDG4_MySensDet/CMakeLists.txt b/examples/DDG4_MySensDet/CMakeLists.txt
index 2cdfe886d..034c29f7c 100644
--- a/examples/DDG4_MySensDet/CMakeLists.txt
+++ b/examples/DDG4_MySensDet/CMakeLists.txt
@@ -20,6 +20,8 @@ endif()
set(DDG4_MySensDet_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/DDG4_MySensDet)
install(DIRECTORY scripts DESTINATION ${DDG4_MySensDet_INSTALL})
dd4hep_configure_scripts(DDG4_MySensDet DEFAULT_SETUP WITH_TESTS)
+enable_testing ()
+include(CTest)
#
#---Geant4 Testsing-----------------------------------------------------------------
#
@@ -43,8 +45,7 @@ if (DD4HEP_USE_GEANT4)
# Geant4 material scan. From position=0,0,0 to end-of-world
dd4hep_add_test_reg( DDG4_MySensDet_g4material_scan_SiliconBlock_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDG4_MySensDet.sh"
- EXEC_ARGS python ${DD4hep_DIR}/python/g4MaterialScan.py
- --compact=file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/SiliconBlock.xml
+ EXEC_ARGS g4MaterialScan --compact=file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/SiliconBlock.xml
"--position=0,0,0" "--direction=0,1,0"
REGEX_PASS " Terminate Geant4 and delete associated actions."
)
diff --git a/examples/LHeD/CMakeLists.txt b/examples/LHeD/CMakeLists.txt
index 4cda9a6b6..57672ec9c 100644
--- a/examples/LHeD/CMakeLists.txt
+++ b/examples/LHeD/CMakeLists.txt
@@ -38,6 +38,8 @@ endif()
#
dd4hep_configure_scripts(LHeD DEFAULT_SETUP WITH_TESTS)
+enable_testing ()
+include(CTest)
#
#---Testing-------------------------------------------------------------------------
#
--
GitLab