From cddbfcd426fdad0ce50783d01bbe1b44c5711b16 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 16:41:32 +0200
Subject: [PATCH] 'CMakeLists.txt' (DataModelAthenaPool-01-06-41)
* Tagging DataModelAthenaPool-01-06-41.
* src/DataVectorConvert.cxx (test_dv): Ignore classes with no
streamerinfo. Prevents spurious errors from root 6.06 about using
InspectMembers on a virtual base. Remove dynamic_cast.
2015-09-03 scott snyder <snyder@bnl.gov>
* Tagging DataModelAthenaPool-01-06-40.
* src/UserDataStoreCnv.h, src/UserDataStoreCnv.cxx: mlog -> m_log.
2015-05-13 scott snyder <snyder@bnl.gov>
* Tagging DataModelAthenaPool-01-06-39.
* Update tests to initialize a dummy event store, rather than
relying on a default StoreGate.
2015-04-22 scott snyder <snyder@bnl.gov>
* Tagging DataModelAthenaPool-01-06-38.
...
(Long ChangeLog diff - truncated)
---
Control/DataModelAthenaPool/CMakeLists.txt | 112 ++++++++++++++++++
.../ElementLinkVector_p1.h | 2 +-
Control/DataModelAthenaPool/cmt/requirements | 1 +
.../src/DataVectorConvert.cxx | 10 +-
.../src/UDSLabelHashTableCnv_p1.cxx | 13 +-
.../src/UserDataStoreCnv.cxx | 12 +-
.../src/UserDataStoreCnv.h | 2 +-
.../test/DataLink_p2_test.cxx | 4 +
.../test/ElementLinkCnv_p1_test.cxx | 4 +
.../test/ElementLinkCnv_p2_test.cxx | 4 +
.../test/ElementLinkCnv_p3_test.cxx | 4 +
.../test/ElementLinkVectorCnv_p1_test.cxx | 4 +
.../test/NavigableCnv_p1_test.cxx | 4 +
.../test/NavigableCnv_p2_test.cxx | 4 +
.../test/NavigableVectorCnv_p1_test.cxx | 4 +
.../test/NavigableVectorCnv_p2_test.cxx | 4 +
16 files changed, 166 insertions(+), 22 deletions(-)
create mode 100644 Control/DataModelAthenaPool/CMakeLists.txt
diff --git a/Control/DataModelAthenaPool/CMakeLists.txt b/Control/DataModelAthenaPool/CMakeLists.txt
new file mode 100644
index 00000000000..4264959a7ec
--- /dev/null
+++ b/Control/DataModelAthenaPool/CMakeLists.txt
@@ -0,0 +1,112 @@
+################################################################################
+# Package: DataModelAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DataModelAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthContainers
+ Control/AthLinks
+ Control/AthenaBaseComps
+ Control/AthenaKernel
+ Control/Navigation
+ Control/RootUtils
+ GaudiKernel
+ PRIVATE
+ AtlasTest/TestTools
+ Control/CLIDSvc
+ Control/SGTools
+ Database/AthenaPOOL/AthenaPoolCnvSvc
+ Database/AthenaPOOL/AthenaPoolUtilities
+ Database/AthenaPOOL/RootConversions )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( DataModelAthenaPoolLib
+ src/*.cxx
+ PUBLIC_HEADERS DataModelAthenaPool
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
+ LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils GaudiKernel RootUtilsPyROOT AthenaPoolCnvSvcLib
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TestTools SGTools AthenaPoolUtilities RootConversions )
+
+atlas_add_component( DataModelAthenaPool
+ src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_poolcnv_library( DataModelAthenaPoolPoolCnv
+ src/*.cxx
+ FILES AthContainers/UserDataStore.h
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_dictionary( DataModelAthenaPoolDictDict
+ DataModelAthenaPool/DataModelAthenaPoolDict.h
+ DataModelAthenaPool/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( DataLink_p2_test
+ SOURCES
+ test/DataLink_p2_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( ElementLinkCnv_p1_test
+ SOURCES
+ test/ElementLinkCnv_p1_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( ElementLinkCnv_p2_test
+ SOURCES
+ test/ElementLinkCnv_p2_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( ElementLinkCnv_p3_test
+ SOURCES
+ test/ElementLinkCnv_p3_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( NavigableCnv_p1_test
+ SOURCES
+ test/NavigableCnv_p1_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( NavigableCnv_p2_test
+ SOURCES
+ test/NavigableCnv_p2_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( NavigableVectorCnv_p1_test
+ SOURCES
+ test/NavigableVectorCnv_p1_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( NavigableVectorCnv_p2_test
+ SOURCES
+ test/NavigableVectorCnv_p2_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+atlas_add_test( ElementLinkVectorCnv_p1_test
+ SOURCES
+ test/ElementLinkVectorCnv_p1_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT GaudiKernel TestTools SGTools AthenaPoolCnvSvcLib AthenaPoolUtilities RootConversions DataModelAthenaPoolLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/DataModelAthenaPool_jobOptions.py )
+
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVector_p1.h b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVector_p1.h
index 1b48cee21be..1a410134d1f 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVector_p1.h
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVector_p1.h
@@ -29,7 +29,7 @@ public:
class ElementRef {
public:
- ElementRef() {}
+ ElementRef() : m_elementIndex(0), m_nameIndex(0) {}
ElementRef(const INDEXTYPE &elink_idx, uint32_t name_idx)
: m_elementIndex(elink_idx), m_nameIndex(name_idx)
{ }
diff --git a/Control/DataModelAthenaPool/cmt/requirements b/Control/DataModelAthenaPool/cmt/requirements
index 439a1d5d45a..ce50c6ee559 100755
--- a/Control/DataModelAthenaPool/cmt/requirements
+++ b/Control/DataModelAthenaPool/cmt/requirements
@@ -30,6 +30,7 @@ use AtlasCLHEP AtlasCLHEP-* External
use AtlasROOT AtlasROOT-* External
use AtlasReflex AtlasReflex-* External
use CLIDSvc CLIDSvc-* Control
+use SGTools SGTools-* Control
use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
use RootConversions RootConversions-* Database/AthenaPOOL
diff --git a/Control/DataModelAthenaPool/src/DataVectorConvert.cxx b/Control/DataModelAthenaPool/src/DataVectorConvert.cxx
index f1ec915b014..d0507c6c0c3 100644
--- a/Control/DataModelAthenaPool/src/DataVectorConvert.cxx
+++ b/Control/DataModelAthenaPool/src/DataVectorConvert.cxx
@@ -366,13 +366,13 @@ void test_dv (RootUtils::ILogger* logfn,
return;
}
+ // If no streaminfos, this class isn't involved in persistency. Skip it.
+ if (infos->GetEntries() == 0)
+ return;
+
// Get the class version, and thence the primary class shape.
int dv_vers = dv_class->GetClassVersion();
- // nb. once we don't need to support root 5.14 any more,
- // the dynamic_cast can be removed and the type of si0
- // changed to TVirtualStreamerInfo.
- TStreamerInfo* si0 =
- dynamic_cast<TStreamerInfo*> (dv_class->GetStreamerInfo());
+ TVirtualStreamerInfo* si0 = dv_class->GetStreamerInfo();
if (si0 == 0) {
if (logfn) {
std::ostringstream ss;
diff --git a/Control/DataModelAthenaPool/src/UDSLabelHashTableCnv_p1.cxx b/Control/DataModelAthenaPool/src/UDSLabelHashTableCnv_p1.cxx
index e63e873efdb..3afad050f6d 100644
--- a/Control/DataModelAthenaPool/src/UDSLabelHashTableCnv_p1.cxx
+++ b/Control/DataModelAthenaPool/src/UDSLabelHashTableCnv_p1.cxx
@@ -2,10 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#define private public
#include "AthContainers/tools/UDSLabelHashTable.h"
-#undef private
-
#include "DataModelAthenaPool/UDSLabelHashTable_p1.h"
#include "DataModelAthenaPool/UDSLabelHashTableCnv_p1.h"
@@ -13,11 +10,9 @@ void UDSLabelHashTableCnv_p1::transToPers(const UDSLabelHashTable& trans, UDSLab
const size_t s=trans.size();
pers.m_label.resize(s);
pers.m_labelHash.resize(s);
- std::map<UDSLabelHashTable::hash_t, std::string>::const_iterator it=trans.m_hashLabels.begin();
- std::map<UDSLabelHashTable::hash_t, std::string>::const_iterator it_e=trans.m_hashLabels.end();
- for(;it!=it_e;++it) {
- pers.m_labelHash.push_back(it->first);
- pers.m_label.push_back(it->second);
+ for (const auto& p : trans) {
+ pers.m_labelHash.push_back(p.first);
+ pers.m_label.push_back(p.second);
}
return;
}
@@ -26,6 +21,6 @@ void UDSLabelHashTableCnv_p1::transToPers(const UDSLabelHashTable& trans, UDSLab
void UDSLabelHashTableCnv_p1::persToTrans(const UDSLabelHashTable_p1& pers, UDSLabelHashTable& trans){
const size_t s=pers.m_labelHash.size();
for (size_t i=0;i<s;++i) {
- trans.m_hashLabels.insert(trans.m_hashLabels.end(),std::make_pair(pers.m_labelHash[i],pers.m_label[i]));
+ trans.addLabel (pers.m_label[i], pers.m_labelHash[i]);
}
}
diff --git a/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx b/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
index 589284ff557..3ef60524eb5 100644
--- a/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
+++ b/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
@@ -9,14 +9,14 @@ UserDataStoreCnv::UserDataStoreCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<UserDataStore, UserDataStore_p1 >( svcloc),
m_converterP1(),
m_guidP1("1D3E6FC1-54CD-4239-9714-9C467160F3FA"),
- mlog(messageService(), "UserDataStoreCnv")
+ m_log(messageService(), "UserDataStoreCnv")
{}
UserDataStore_p1* UserDataStoreCnv::createPersistent(UserDataStore* transObj) {
UserDataStore_p1* pers=new UserDataStore_p1();
- m_converterP1.transToPers(*transObj,*pers,mlog);
+ m_converterP1.transToPers(*transObj,*pers,m_log);
return pers;
}
@@ -27,15 +27,15 @@ UserDataStore* UserDataStoreCnv::createTransient () {
UserDataStore* trans=0;
if (compareClassGuid(m_guidP1)) {
- if (mlog.level() <= MSG::DEBUG) mlog << MSG::DEBUG << "Reading version UserDataStore_p1" << endreq;
+ if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Reading version UserDataStore_p1" << endreq;
trans=new UserDataStore();
UserDataStore_p1* pers=poolReadObject<UserDataStore_p1>();
- m_converterP1.persToTrans(*pers,*trans,mlog);
- if (mlog.level() <= MSG::DEBUG) mlog << MSG::DEBUG << "Done converting UserDataStore_p1 to UserDataStore" << endreq;
+ m_converterP1.persToTrans(*pers,*trans,m_log);
+ if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Done converting UserDataStore_p1 to UserDataStore" << endreq;
delete pers;
}
else {
- mlog << MSG::ERROR << "Unsupported persistent version of UserDataSvc GUID=" << m_classID.toString() << endreq;
+ m_log << MSG::ERROR << "Unsupported persistent version of UserDataSvc GUID=" << m_classID.toString() << endreq;
//throw std::runtime_error("Unsupported persistent version of UserDataSvc");
}
return trans;
diff --git a/Control/DataModelAthenaPool/src/UserDataStoreCnv.h b/Control/DataModelAthenaPool/src/UserDataStoreCnv.h
index 0d508929589..66c40dd8473 100644
--- a/Control/DataModelAthenaPool/src/UserDataStoreCnv.h
+++ b/Control/DataModelAthenaPool/src/UserDataStoreCnv.h
@@ -27,7 +27,7 @@ class UserDataStoreCnv : public T_AthenaPoolCustomCnv<UserDataStore, UserDataSt
private:
UserDataStoreCnv_p1 m_converterP1;
pool::Guid m_guidP1;
- MsgStream mlog;
+ MsgStream m_log;
};
diff --git a/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx b/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
index 178fc345feb..fcd18c46a22 100755
--- a/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
@@ -21,6 +21,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public std::vector<int>
{
@@ -50,6 +53,7 @@ void test1()
int main()
{
+ SGTest::initTestStore();
test1();
return 0;
}
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
index 930424556a2..472ca2c452e 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
@@ -22,6 +22,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public std::vector<int>
{
@@ -54,6 +57,7 @@ void test1()
int main()
{
+ SGTest::initTestStore();
test1();
return 0;
}
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
index be41332653e..0ae5441fdc5 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
@@ -22,6 +22,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public std::vector<int>
{
@@ -61,6 +64,7 @@ void test1()
int main()
{
+ SGTest::initTestStore();
test1();
return 0;
}
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
index 337c407273a..785920512c7 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
@@ -22,6 +22,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public std::vector<int>
{
@@ -53,6 +56,7 @@ void test1()
int main()
{
+ SGTest::initTestStore();
test1();
return 0;
}
diff --git a/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
index f5030e40853..89d0ead85fd 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
@@ -22,6 +22,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public std::vector<int>
{
@@ -77,6 +80,7 @@ void test1()
int main()
{
+ SGTest::initTestStore();
test1();
return 0;
}
diff --git a/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
index d2a50e48882..8320ee5aa24 100644
--- a/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
@@ -24,6 +24,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public DataVector<NavigableTerminalNode>
{
@@ -101,6 +104,7 @@ void test2()
int main()
{
+ SGTest::initTestStore();
test1();
test2();
return 0;
diff --git a/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
index 902c03cf5c2..6d24041ebe4 100644
--- a/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
@@ -24,6 +24,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public DataVector<NavigableTerminalNode>
{
@@ -97,6 +100,7 @@ void test2()
int main()
{
+ SGTest::initTestStore();
test1();
test2();
return 0;
diff --git a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
index b08aa1f3264..c7f9eee352e 100644
--- a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
@@ -24,6 +24,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public DataVector<NavigableTerminalNode>
{
@@ -169,6 +172,7 @@ void test2()
int main()
{
+ SGTest::initTestStore();
test1();
test2();
return 0;
diff --git a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
index 0739dbf9c35..ac6e3f90243 100644
--- a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
@@ -24,6 +24,9 @@
#include <iostream>
+#include "SGTools/TestStore.h"
+
+
class MyVI
: public DataVector<NavigableTerminalNode>
{
@@ -161,6 +164,7 @@ void test2()
int main()
{
+ SGTest::initTestStore();
test1();
test2();
return 0;
--
GitLab