IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a number of test mismatches between cmake and autotools

Browse Source 
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
This commit is contained in:
Geert Janssens
2017-08-16 12:40:19 +02:00
parent 53afd36de1
commit 1883d8ec31
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gnucash/import-export/test/Makefile.am
View File

@@ -25,7 +25,8 @@ LDADD = \
TESTS = \ TESTS = \
test-link \ test-link \
test-import-parse test-import-parse \
test-import-pending-matches
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
--gnc-module-dir ${top_builddir}/libgnucash/app-utils \ --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
@@ -53,9 +54,8 @@ TESTS_ENVIRONMENT = \
check_PROGRAMS = \ check_PROGRAMS = \
test-link \ test-link \
test-import-parse test-import-parse \
test-import-pending-matches
TEST_PROGS += test-import-pending-matches
noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS) noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS)

6
libgnucash/app-utils/test/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ MACRO(ADD_APP_UTILS_TEST _TARGET _SOURCE_FILES)
ENDMACRO() ENDMACRO()
ADD_APP_UTILS_TEST(test-exp-parser test-exp-parser.c) 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) ADD_APP_UTILS_TEST(test-print-parse-amount test-print-parse-amount.cpp)
# This test not run in autotools build. # 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) #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) 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: # 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) CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)

6
libgnucash/engine/test/CMakeLists.txt
View File

@@ -184,6 +184,12 @@ SET(test_gnc_datetime_SOURCES
GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}" GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS) 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. # This is a C test that needs GUILE environment variables set.
# It does not pass on Win32. # It does not pass on Win32.