From 1883d8ec31029f5a213ce560992320dd3d83246d Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Wed, 16 Aug 2017 12:40:19 +0200
Subject: [PATCH] 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
---
 gnucash/import-export/test/Makefile.am   | 8 ++++----
 libgnucash/app-utils/test/CMakeLists.txt | 6 +++---
 libgnucash/engine/test/CMakeLists.txt    | 6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnucash/import-export/test/Makefile.am b/gnucash/import-export/test/Makefile.am
index 3cca84af49..fa768ae1a3 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 1985d36d3e..35bc187d74 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 209a120655..32ba365b53 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.