9280c9a961
- support BUILD_FOR_SSE/SSE2 on %ix86/x86_64 (#1400481) - enable/fix python bindings - pull in upstream fixes (tests, buildsys)
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
diff -up lensfun-0.3.2/tests/CMakeLists.txt.0525 lensfun-0.3.2/tests/CMakeLists.txt
|
|
--- lensfun-0.3.2/tests/CMakeLists.txt.0525 2015-11-15 11:07:26.000000000 -0600
|
|
+++ lensfun-0.3.2/tests/CMakeLists.txt 2016-12-01 06:33:04.868398080 -0600
|
|
@@ -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_coor
|
|
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 -up lensfun-0.3.2/tests/test_database.cpp.0525 lensfun-0.3.2/tests/test_database.cpp
|
|
--- lensfun-0.3.2/tests/test_database.cpp.0525 2016-12-01 06:33:04.869398085 -0600
|
|
+++ lensfun-0.3.2/tests/test_database.cpp 2016-12-01 06:33:32.530537014 -0600
|
|
@@ -10,7 +10,7 @@ typedef struct {
|
|
void db_setup(lfFixture *lfFix, gconstpointer data)
|
|
{
|
|
lfFix->db = lf_db_new ();
|
|
- lfFix->db->Load();
|
|
+ lfFix->db->LoadDirectory("data/db");
|
|
}
|
|
|
|
|