Fix test environment and typo

AIDASoft · Jun 15, 2023 · 50837d8 · 50837d8
1 parent 14c2010
commit 50837d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/python/templates/Collection.cc.jinja2 b/python/templates/Collection.cc.jinja2
@@ -218,6 +218,14 @@ bool registerCollection() {
     auto& factory = podio::CollectionBufferFactory::mutInstance();
     factory.registerCreationFunc("{{ class.full_type }}Collection", {{ package_name }}::meta::schemaVersion, createBuffers);
 
+    podio::SchemaEvolution::mutInstance().registerEvolutionFunc(
+      "{{ class.full_type }}Collection",
+      {{ package_name }}::meta::schemaVersion,
+      {{ package_name }}::meta::schemaVersion,
+      podio::SchemaEvolution::noOpSchemaEvolution,
+      podio::SchemaEvolution::Priority::AutoGenerated
+    );
+
     return true;
   }();
   return reg;

diff --git a/tests/schema_evolution/CMakeLists.txt b/tests/schema_evolution/CMakeLists.txt
@@ -25,9 +25,9 @@ function(PODIO_CREATE_WRITE_OLD_DATA_TEST sourcefile additional_libs)
 
   set_property(TEST ${name}
     PROPERTY ENVIRONMENT
-    LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src:${CMAKE_CURRENT_BINARY_DIR}:$<TARGET_FILE_DIR:ROOT::Tree>:$<$<TARGET_EXISTS:SIO::sio>:$<TARGET_FILE_DIR:SIO::sio>>:$ENV{LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src:${CMAKE_BINARY_DIR}/tests/schema_evolution:$<TARGET_FILE_DIR:ROOT::Tree>:$<$<TARGET_EXISTS:SIO::sio>:$<TARGET_FILE_DIR:SIO::sio>>:$ENV{LD_LIBRARY_PATH}
     PODIO_SIO_BLOCK=${CMAKE_CURRENT_BINARY_DIR}
-    ROOT_INCLUDE_PATH=${CMAKE_CURRENT_BINARY_DIR}/datamodel_old:${CMAKE_SOURCE_DIR}/include
+    ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tests/schema_evolution/datamodel_old:${CMAKE_SOURCE_DIR}/include
   )
 endfunction()
 

diff --git a/tests/schema_evolution/write_old_data.h b/tests/schema_evolution/write_old_data.h
@@ -35,7 +35,7 @@ podio::Frame createFrame() {
   podio::Frame event;
 
   event.put(writeSimpleStruct(), "simpleStructTest");
-  event.put(writeExampleHit(), "dataTypeMemberAdditionTest");
+  event.put(writeExampleHit(), "datatypeMemberAdditionTest");
 
   return event;
 }