|
 |
714cf1 |
From 3f74b78e4ee9f1d400ebbf2b9093a0f9c48c6307 Mon Sep 17 00:00:00 2001
|
|
|
714cf1 |
From: Sebastian Kraft <mail@sebastiankraft.net>
|
|
|
714cf1 |
Date: Sat, 9 Jan 2016 20:48:16 +0100
|
|
|
714cf1 |
Subject: [PATCH 058/113] Use database in source directory while running tests.
|
|
|
714cf1 |
Fixes bug #46.
|
|
|
714cf1 |
|
|
|
714cf1 |
---
|
|
|
714cf1 |
tests/CMakeLists.txt | 4 ++--
|
|
|
714cf1 |
tests/test_database.cpp | 2 +-
|
|
|
714cf1 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
714cf1 |
|
|
|
714cf1 |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
|
714cf1 |
index b79fda6..4056072 100644
|
|
|
714cf1 |
--- a/tests/CMakeLists.txt
|
|
|
714cf1 |
+++ b/tests/CMakeLists.txt
|
|
|
714cf1 |
@@ -1,6 +1,6 @@
|
|
|
714cf1 |
ADD_EXECUTABLE(test_database test_database.cpp)
|
|
|
714cf1 |
TARGET_LINK_LIBRARIES(test_database lensfun ${COMMON_LIBS})
|
|
|
714cf1 |
-ADD_TEST(Database test_database)
|
|
|
714cf1 |
+ADD_TEST(NAME Database WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND test_database)
|
|
|
714cf1 |
|
|
|
714cf1 |
ADD_EXECUTABLE(test_modifier test_modifier.cpp)
|
|
|
714cf1 |
TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_LIBS})
|
|
|
714cf1 |
@@ -30,4 +30,4 @@ TARGET_LINK_LIBRARIES(test_modifier_coord_geometry lensfun ${COMMON_LIBS})
|
|
|
714cf1 |
ADD_TEST(Modifier_coord_geometry test_modifier_coord_geometry)
|
|
|
714cf1 |
|
|
|
714cf1 |
FIND_PACKAGE(PythonInterp REQUIRED)
|
|
|
714cf1 |
-ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ../../data/db)
|
|
|
714cf1 |
+ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ${CMAKE_SOURCE_DIR}/data/db)
|
|
|
714cf1 |
diff --git a/tests/test_database.cpp b/tests/test_database.cpp
|
|
|
714cf1 |
index 45dc38f..49a2644 100644
|
|
|
714cf1 |
--- a/tests/test_database.cpp
|
|
|
714cf1 |
+++ b/tests/test_database.cpp
|
|
|
714cf1 |
@@ -10,7 +10,7 @@ typedef struct {
|
|
|
714cf1 |
void db_setup(lfFixture *lfFix, gconstpointer data)
|
|
|
714cf1 |
{
|
|
|
714cf1 |
lfFix->db = new lfDatabase ();
|
|
|
714cf1 |
- lfFix->db->Load();
|
|
|
714cf1 |
+ lfFix->db->LoadDirectory("data/db");
|
|
|
714cf1 |
}
|
|
|
714cf1 |
|
|
|
714cf1 |
|
|
|
714cf1 |
--
|
|
|
714cf1 |
2.7.4
|
|
|
714cf1 |
|