From 5f95f5fa5af734af9ea350b29128e63c60eb61b8 Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Mon, 10 Jul 2017 08:04:42 +0000
Subject: [PATCH] Merge branch 'cmake2.BeamEffects-20170709' into 'master'
BeamEffects: Fix typos in cmake file; add missing test reference file.
See merge request !3231
Former-commit-id: ea47b6ce31407549d6fb009f18dfc202214bb9d5
---
Simulation/BeamEffects/CMakeLists.txt | 11 +++---
.../BeamEffects/share/BeamEffectsAlg_test.ref | 34 +++++++++++++++++++
2 files changed, 40 insertions(+), 5 deletions(-)
create mode 100644 Simulation/BeamEffects/share/BeamEffectsAlg_test.ref
diff --git a/Simulation/BeamEffects/CMakeLists.txt b/Simulation/BeamEffects/CMakeLists.txt
index c48b45c329a..658a428cf4a 100644
--- a/Simulation/BeamEffects/CMakeLists.txt
+++ b/Simulation/BeamEffects/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/CxxUtils
Control/StoreGate
Event/EventInfo
- Generator/GeneratorObjects
+ Generators/GeneratorObjects
InnerDetector/InDetConditions/InDetBeamSpotService
Simulation/Interfaces/HepMC_Interfaces
Simulation/Tools/AtlasCLHEP_RandomGenerators )
@@ -31,15 +31,16 @@ include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
atlas_add_test( BeamEffectsAlg_test
SOURCES src/*.cxx test/BeamEffectsAlg_test.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HepMC_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} #${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HepMC_LIBRARIES} GaudiKernel TestTools AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects AtlasCLHEP_RandomGenerators ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
+ INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} #${GMOCK_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel TestTools AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects AtlasCLHEP_RandomGenerators ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
+ EXTRA_PATTERNS "[0-9]+ ms"
)
atlas_add_component( BeamEffects
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HepMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HepMC_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects AtlasCLHEP_RandomGenerators )
+ INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects AtlasCLHEP_RandomGenerators )
# Install files from the package:
atlas_install_headers( BeamEffects )
diff --git a/Simulation/BeamEffects/share/BeamEffectsAlg_test.ref b/Simulation/BeamEffects/share/BeamEffectsAlg_test.ref
new file mode 100644
index 00000000000..7ba79842529
--- /dev/null
+++ b/Simulation/BeamEffects/share/BeamEffectsAlg_test.ref
@@ -0,0 +1,34 @@
+[==========] Running 6 tests from 1 test case.
+[----------] Global test environment set-up.
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Fri Feb 17 22:54:02 2017
+====================================================================================================================================
+ApplicationMgr INFO Application Manager Configured successfully
+EventLoopMgr WARNING Unable to locate service "EventSelector"
+EventLoopMgr WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+[----------] 6 tests from BeamEffectsAlg_test
+[ RUN ] BeamEffectsAlg_test.empty_alg_execute
+ClassIDSvc INFO getRegistryEntries: read 1507 CLIDRegistry entries for module ALL
+BeamEffectsAlg FATAL No input McEventCollection called GEN_EVENT in StoreGate.
+[ OK ] BeamEffectsAlg_test.empty_alg_execute (179 ms)
+[ RUN ] BeamEffectsAlg_test.set_properties
+ClassIDSvc INFO getRegistryEntries: read 359 CLIDRegistry entries for module ALL
+[ OK ] BeamEffectsAlg_test.set_properties (2 ms)
+[ RUN ] BeamEffectsAlg_test.signal_process_vertex_exists
+[ OK ] BeamEffectsAlg_test.signal_process_vertex_exists (1 ms)
+[ RUN ] BeamEffectsAlg_test.add_signal_process_vertex_atlasG4
+[ OK ] BeamEffectsAlg_test.add_signal_process_vertex_atlasG4 (0 ms)
+[ RUN ] BeamEffectsAlg_test.add_signal_process_vertex_isfG4
+[ OK ] BeamEffectsAlg_test.add_signal_process_vertex_isfG4 (0 ms)
+[ RUN ] BeamEffectsAlg_test.execute_pass_through
+[ OK ] BeamEffectsAlg_test.execute_pass_through (1 ms)
+[----------] 6 tests from BeamEffectsAlg_test (183 ms total)
+
+[----------] Global test environment tear-down
+[==========] 6 tests from 1 test case ran. (572 ms total)
+[ PASSED ] 6 tests.
--
GitLab