From 9903c4c87d504e023fe1a494668a36df7d7dfb38 Mon Sep 17 00:00:00 2001 From: Marko Petric <marko.petric@cern.ch> Date: Thu, 17 Nov 2016 15:59:54 +0100 Subject: [PATCH] Add and statements between steps to abort --- .dd4hep-ci.d/compile_and_test.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh index 16054d97d..efd5c2c23 100755 --- a/.dd4hep-ci.d/compile_and_test.sh +++ b/.dd4hep-ci.d/compile_and_test.sh @@ -8,15 +8,15 @@ source /DD4hep/.dd4hep-ci.d/init_x86_64.sh cd /DD4hep mkdir build cd build -cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release .. -ninja -ninja install -. ../bin/thisdd4hep.sh -ctest --output-on-failure -j4 -cd ../examples/ -mkdir build -cd build -cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON .. -ninja -ninja install +cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release .. && \ +ninja && \ +ninja install && \ +. ../bin/thisdd4hep.sh && \ +ctest --output-on-failure -j4 && \ +cd ../examples/ && \ +mkdir build && \ +cd build && \ +cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON .. && \ +ninja && \ +ninja install && \ ctest --output-on-failure -j2 -E LONGTEST -- GitLab