From 56e8385d3428ed1db2317ffd1ec8b637253075aa Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 17 Mar 2017 20:31:17 +0100
Subject: [PATCH] Cleanup and extending the data parsers for XML/JSON add
example ClientTests/MiniTel_json
---
examples/ClientTests/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 79c0a5f25..1a7733b4f 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -22,6 +22,7 @@ dd4hep_package (ClientTests MAJOR 0 MINOR 0 PATCH 1
dd4hep_add_plugin( ClientTests SOURCES src/*.cpp
OPTIONAL [BOOST SOURCES src_boost/*.cpp]
)
+#
dd4hep_install_dir( compact scripts DESTINATION ${DD4hep_DIR}/examples/ClientTests )
#--------------------------------------------------------------------------
@@ -32,9 +33,8 @@ dd4hep_configure_scripts( ClientTests DEFAULT_SETUP WITH_TESTS)
# Test JSON based detector construction
dd4hep_add_test_reg( ClientTests_MiniTel_JSON
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS geoDisplay
- -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/MiniTel_json.xml
- -volmgr -destroy -load_only
+ EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hepCompactLoader
+ file:${CMAKE_CURRENT_SOURCE_DIR}/compact/MiniTel_json.xml
REGEX_PASS "Successfully processed JSON input"
REGEX_FAIL "Exception"
REGEX_FAIL "FAILED"
--
GitLab