From 869f12cd32833cda6a249eaf6f1dac03a87e7120 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 18:08:31 +0000 Subject: Apply patch 0058-Use-database-in-source-directory-while-running-tests.patch patch_name: 0058-Use-database-in-source-directory-while-running-tests.patch present_in_specfile: true --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b79fda6..4056072 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_EXECUTABLE(test_database test_database.cpp) TARGET_LINK_LIBRARIES(test_database lensfun ${COMMON_LIBS}) -ADD_TEST(Database test_database) +ADD_TEST(NAME Database WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND test_database) ADD_EXECUTABLE(test_modifier test_modifier.cpp) TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_LIBS}) @@ -30,4 +30,4 @@ TARGET_LINK_LIBRARIES(test_modifier_coord_geometry lensfun ${COMMON_LIBS}) ADD_TEST(Modifier_coord_geometry test_modifier_coord_geometry) FIND_PACKAGE(PythonInterp REQUIRED) -ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ../../data/db) +ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ${CMAKE_SOURCE_DIR}/data/db) diff --git a/tests/test_database.cpp b/tests/test_database.cpp index 45dc38f..49a2644 100644 --- a/tests/test_database.cpp +++ b/tests/test_database.cpp @@ -10,7 +10,7 @@ typedef struct { void db_setup(lfFixture *lfFix, gconstpointer data) { lfFix->db = new lfDatabase (); - lfFix->db->Load(); + lfFix->db->LoadDirectory("data/db"); }