tests not working #1

feelpp · Jan 25, 2022 · 26644f5 · 26644f5
1 parent f38694d
commit 26644f5
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable(performance_test run.cpp)
+configure_file(configuration.lua configuration.lua COPYONLY)
+ADD_CUSTOM_TARGET(performance_test_sync ALL
+                  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/configuration ${CMAKE_CURRENT_BINARY_DIR}/configuration
+                  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/result ${CMAKE_CURRENT_BINARY_DIR}/result
+                  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/module_performance ${CMAKE_CURRENT_BINARY_DIR}/module_performance)
+add_dependencies(performance_test performance_test_sync)
+target_link_libraries(performance_test verdandi gtest_main)
+
+include(GoogleTest)
+gtest_discover_tests(performance_test)
diff --git a/test/performance/run.cpp b/test/performance/run.cpp
@@ -27,6 +27,9 @@
 #define VERDANDI_WITH_TRAJECTORY_MANAGER
 
 #include "Verdandi.hxx"
+#define VERDANDI_GTEST_MODEL Verdandi::QuadraticModel<real>
+#define VERDANDI_GTEST_MODEL_PATH "model/QuadraticModel.cxx"
+#define VERDANDI_GTEST_CONFIG_PATH "configuration.lua"
 #include VERDANDI_GTEST_MODEL_PATH
 #include "seldon/computation/optimization/NLoptSolver.cxx"
 #include "seldon/SeldonSolver.hxx"

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -1,3 +1,3 @@
-#add_subdirectory(method)
+add_subdirectory(method)
 add_subdirectory(model)
 add_subdirectory(tool)
diff --git a/test/unit/method/CMakeLists.txt b/test/unit/method/CMakeLists.txt
@@ -0,0 +1,19 @@
+# add_executable(TestInstantiator TestInstantiator.cxx)
+# target_link_libraries(TestInstantiator vtkCommon)
+# add_test(NAME TestInstantiator
+#          COMMAND TestInstantiator)
+
+# set(VERDANDI_GTEST_MODEL "Verdandi::QuadraticModel<real>")
+# set(VERDANDI_GTEST_CONFIG_PATH "\'\"configuration.lua\"\'")
+
+add_executable(method_test run.cpp)
+configure_file(configuration.lua configuration.lua COPYONLY)
+ADD_CUSTOM_TARGET(method_test_sync ALL
+                  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/configuration ${CMAKE_CURRENT_BINARY_DIR}/configuration
+                  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/result ${CMAKE_CURRENT_BINARY_DIR}/result)
+add_dependencies(method_test method_test_sync)
+
+target_link_libraries( method_test seldon verdandi gtest_main )
+
+include(GoogleTest)
+gtest_discover_tests(method_test)
diff --git a/test/unit/method/test_compare.hpp b/test/unit/method/test_compare.hpp
@@ -31,6 +31,10 @@
 #include "method/ReducedOrderExtendedKalmanFilter.cxx"
 #include "method/Nudging.cxx"
 
+#define VERDANDI_GTEST_MODEL Verdandi::QuadraticModel<real>
+#define VERDANDI_GTEST_MODEL_PATH "model/QuadraticModel.cxx"
+#define VERDANDI_GTEST_CONFIG_PATH "configuration.lua"
+
 
 using namespace Verdandi;
 typedef Verdandi::Vector<double> state;