gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Wed Aug 16 06:41:57 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/1883d8ec (commit)
via https://github.com/Gnucash/gnucash/commit/53afd36d (commit)
from https://github.com/Gnucash/gnucash/commit/723530a9 (commit)
commit 1883d8ec31029f5a213ce560992320dd3d83246d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Aug 16 12:40:19 2017 +0200
Fix a number of test mismatches between cmake and autotools
cmake:
- add test-app-utils
- rename test-link-module to test-link-module-app-utils
- add gtest-import-map
autotools:
- move gtest-import-map from TEST_PROGS to TESTS (autotools) so it shows up in the colored results list
diff --git a/gnucash/import-export/test/Makefile.am b/gnucash/import-export/test/Makefile.am
index 3cca84a..fa768ae 100644
--- a/gnucash/import-export/test/Makefile.am
+++ b/gnucash/import-export/test/Makefile.am
@@ -25,7 +25,8 @@ LDADD = \
TESTS = \
test-link \
- test-import-parse
+ test-import-parse \
+ test-import-pending-matches
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
--gnc-module-dir ${top_builddir}/libgnucash/app-utils \
@@ -53,9 +54,8 @@ TESTS_ENVIRONMENT = \
check_PROGRAMS = \
test-link \
- test-import-parse
-
-TEST_PROGS += test-import-pending-matches
+ test-import-parse \
+ test-import-pending-matches
noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS)
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 1985d36..35bc187 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -18,7 +18,7 @@ MACRO(ADD_APP_UTILS_TEST _TARGET _SOURCE_FILES)
ENDMACRO()
ADD_APP_UTILS_TEST(test-exp-parser test-exp-parser.c)
-GNC_ADD_TEST_WITH_GUILE(test-link-module test-link-module APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
+GNC_ADD_TEST_WITH_GUILE(test-link-module-app-utils test-link-module APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
ADD_APP_UTILS_TEST(test-print-parse-amount test-print-parse-amount.cpp)
# This test not run in autotools build.
#GNC_ADD_TEST_WITH_GUILE(test-print-queries test-print-queries.cpp APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
@@ -27,9 +27,9 @@ GNC_ADD_TEST_WITH_GUILE(test-scm-query-string test-scm-query-string.cpp
)
ADD_APP_UTILS_TEST(test-sx test-sx.cpp)
-GNC_ADD_SCHEME_TEST(scm-test-load-module test-load-module.in)
+GNC_ADD_SCHEME_TEST(scm-test-load-module-app-utils test-load-module.in)
# Doesn't work yet:
-#ADD_APP_UTILS_TEST(test-app-utils "${test_app_utils_SOURCES}")
+GNC_ADD_TEST_WITH_GUILE(test-app-utils "${test_app_utils_SOURCES}" APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 209a120..32ba365 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -184,6 +184,12 @@ SET(test_gnc_datetime_SOURCES
GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS)
+SET(test_import_map_SOURCES
+ gtest-import-map.cpp
+ ${GTEST_SRC})
+GNC_ADD_TEST(test-import-map "${test_import_map_SOURCES}"
+ gtest_engine_INCLUDES gtest_old_engine_LIBS)
+
############################
# This is a C test that needs GUILE environment variables set.
# It does not pass on Win32.
commit 53afd36de1bf8a1841029ab0d3198b3dd3c13c4a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Aug 16 11:59:27 2017 +0200
Keep the test modules from gnc-module outside of the normal GNC_MODULE_PATH
They interfere with other tests and pollute the build logs in cmake.
diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
index 99dd66d..7bc44d7 100644
--- a/libgnucash/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -22,7 +22,7 @@ FUNCTION(RUN_TEST_WITH_GUILE _TARGET _SOURCE_FILE)
GET_GUILE_ENV()
SET(CMAKE_COMMAND_TMP "")
IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
- SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "${GUILE_ENV}")
+ SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "${GUILE_ENV};GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test")
ENDIF()
ADD_TEST(NAME ${_TARGET}
COMMAND ${CMAKE_COMMAND_TMP}
@@ -32,7 +32,7 @@ FUNCTION(RUN_TEST_WITH_GUILE _TARGET _SOURCE_FILE)
SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};${ARGN}")
ENDFUNCTION()
-GNC_ADD_TEST_WITH_GUILE(test-load-c test-load-c.c GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS)
+GNC_ADD_TEST_WITH_GUILE(test-load-c test-load-c.c GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS "GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test")
RUN_TEST_WITH_GUILE(test-load-scm ${CMAKE_CURRENT_SOURCE_DIR}/test-load-scm.in)
@@ -52,6 +52,7 @@ GNC_ADD_TEST_WITH_GUILE(test-incompatdep test-incompatdep.c
)
GNC_ADD_TEST_WITH_GUILE(test-agedver test-agedver.c
GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS
+ "GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test"
)
SET(_LIBDIR ${CMAKE_BINARY_DIR}/lib)
@@ -76,13 +77,13 @@ FUNCTION(RUN_GUILE_SHELL_TEST _TARGET _SOURCE_FILE)
GET_GUILE_ENV()
SET(CMAKE_COMMAND_TMP "")
IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
- SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "${GUILE_ENV}")
+ SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "${GUILE_ENV};GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test")
ENDIF()
ADD_TEST(NAME ${_TARGET}
COMMAND ${CMAKE_COMMAND_TMP}
${SHELL} ${_SOURCE_FILE}
)
- SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV}")
+ SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test")
ENDFUNCTION()
RUN_GUILE_SHELL_TEST(test-gwrapped-c ${CMAKE_CURRENT_BINARY_DIR}/test-gwrapped-c)
diff --git a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
index 0196333..49a0520 100644
--- a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
@@ -13,4 +13,9 @@ TARGET_LINK_LIBRARIES(gncmod_futuremodsys ${GLIB2_LDFLAGS})
ADD_LIBRARY(gncmod_incompatdep EXCLUDE_FROM_ALL incompatdep.c)
TARGET_LINK_LIBRARIES(gncmod_incompatdep gnc-module ${GLIB2_LDFLAGS})
-SET_DIST_LIST(misc_mods_DIST CMakeLists.txt Makefile.am agedver.c futuremodsys.c incompatdep.c)
\ No newline at end of file
+SET_TARGET_PROPERTIES(gncmod_agedver gncmod_futuremodsys gncmod_incompatdep PROPERTIES
+LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+SET_DIST_LIST(misc_mods_DIST CMakeLists.txt Makefile.am agedver.c futuremodsys.c incompatdep.c)
diff --git a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
index 36b5905..8a90648 100644
--- a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
@@ -21,4 +21,9 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE
${GUILE_INCLUDE_DIRS}
)
-SET_DIST_LIST(mod_bar_DIST CMakeLists.txt Makefile.am bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c)
\ No newline at end of file
+SET_TARGET_PROPERTIES(bar gncmodbar PROPERTIES
+LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+SET_DIST_LIST(mod_bar_DIST CMakeLists.txt Makefile.am bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c)
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index f287b7d..776150c 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -27,4 +27,9 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
${GUILE_INCLUDE_DIRS}
)
-SET_DIST_LIST(mod_baz_DIST CMakeLists.txt Makefile.am baz.c gnucash/baz.scm baz.h baz.i gnc-mod-baz.c)
\ No newline at end of file
+SET_TARGET_PROPERTIES(baz gncmodbaz PROPERTIES
+LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+SET_DIST_LIST(mod_baz_DIST CMakeLists.txt Makefile.am baz.c gnucash/baz.scm baz.h baz.i gnc-mod-baz.c)
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index c98c7d2..2b5d1ce 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -21,4 +21,9 @@ TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
${GUILE_INCLUDE_DIRS}
)
+SET_TARGET_PROPERTIES(foo gncmodfoo PROPERTIES
+LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
+RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
SET_DIST_LIST(mod_foo_DIST CMakeLists.txt Makefile.am foo.i gnucash/foo.scm foo.c foo.h gnc-mod-foo.c)
Summary of changes:
gnucash/import-export/test/Makefile.am | 8 ++++----
libgnucash/app-utils/test/CMakeLists.txt | 6 +++---
libgnucash/engine/test/CMakeLists.txt | 6 ++++++
libgnucash/gnc-module/test/CMakeLists.txt | 9 +++++----
libgnucash/gnc-module/test/misc-mods/CMakeLists.txt | 7 ++++++-
libgnucash/gnc-module/test/mod-bar/CMakeLists.txt | 7 ++++++-
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt | 7 ++++++-
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt | 5 +++++
8 files changed, 41 insertions(+), 14 deletions(-)
More information about the gnucash-changes
mailing list