Merge branch 'XMLCoreParser_unitTestFix_21.0' into '21.0'

Fix XMLCoreParser unit tests in 21.0 branch

See merge request atlas/athena!7337

Former-commit-id: 4b0cb8212d58d769898de07985bfa4afe4de6512

Tools/XMLCoreParser/CMakeLists.txt

@@ -25,13 +25,15 @@ atlas_add_test( example1_test
                 SOURCES
                 test/example1_test.cxx
                 INCLUDE_DIRS ${EXPAT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${EXPAT_LIBRARIES} TestTools XMLCoreParser )
+                LINK_LIBRARIES ${EXPAT_LIBRARIES} TestTools XMLCoreParser
+                ENVIRONMENT "XMLCOREPARSER_DATA=${CMAKE_CURRENT_SOURCE_DIR}/data" )
 
 atlas_add_test( example2_test
                 SOURCES
                 test/example2_test.cxx
                 INCLUDE_DIRS ${EXPAT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${EXPAT_LIBRARIES} TestTools XMLCoreParser )
+                LINK_LIBRARIES ${EXPAT_LIBRARIES} TestTools XMLCoreParser
+                ENVIRONMENT "XMLCOREPARSER_DATA=${CMAKE_CURRENT_SOURCE_DIR}/data" )
 
 atlas_add_executable( example4
                       doc/example4.cxx

Tools/XMLCoreParser/cmt/requirements

@@ -31,5 +31,3 @@ macro texpatlinkopts "" WIN32 " $(cmt_installarea_linkopts) $(Expat_linkopts) "
 
 application texpat texpat.cxx DOMNode.cxx ExpatCoreParser.cxx 
 macro texpat_dependencies XMLCoreParser
-
-

Tools/XMLCoreParser/src/ExpatCoreParser.cxx

@@ -256,6 +256,10 @@ void ExpatCoreParser::do_comment (const XML_Char* s)
     {
       std::cout << "ExpatCoreParser::do_comment> s=" << s << " top=" << m_top << " last=" << m_last << " node=" << node << std::endl; 
     }
+
+  // Node is owned by m_last.
+  // cppcheck-suppress memleak
+  node = nullptr;
 }
 
 int ExpatCoreParser::generic_parse (XML_Parser p, const std::string& file_name)

Tools/XMLCoreParser/test/example1_test.cxx

@@ -16,9 +16,14 @@ int main (int argc, char* argv[])
   parser.register_external_entity ("LVL1Calorimeter", "NULL");
   parser.register_external_entity ("MuonSpectrometer", "NULL");
 
-  const char* file = "../data/ATLAS_AGDD.xml";
+  const char* dir = getenv("XMLCOREPARSER_DATA");
+  if (!dir)
+    dir = "../data";
+  std::string file = dir;
   if (argc > 1)
     file = argv[1]; 
+  else
+    file += "/ATLAS_AGDD.xml";
 
   parser.parse (file);
   return (0);

Tools/XMLCoreParser/test/example2_test.cxx

@@ -48,9 +48,14 @@ int main (int argc, char* argv[])
   p.register_external_entity ("MuonSpectrometer", "NULL");
   p.register_external_entity ("MuonSpectrometer", "");
 
-  const char* file = "../data/ATLAS_AGDD.xml";
-  if (argc > 1) 
+  const char* dir = getenv("XMLCOREPARSER_DATA");
+  if (!dir)
+    dir = "../data";
+  std::string file = dir;
+  if (argc > 1)
     file = argv[1]; 
+  else
+    file += "/ATLAS_AGDD.xml";
  
   p.visit (file); 
   return (0);