gnucash unstable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Nov 7 18:04:48 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/6c01e540 (commit)
via https://github.com/Gnucash/gnucash/commit/f412795e (commit)
from https://github.com/Gnucash/gnucash/commit/4f971636 (commit)
commit 6c01e540424ca69b852ee648b882f5bdcee708b9
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 16:33:08 2017 -0700
Convert shell-executed scheme tests to run directly from Guile.
I.e., remove the shell invocation and with it the need to set the shebang.
Surprisingly this required some build-system modifications particularly
for cmake in order to correctly set the environment.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 3ad98bc..ffe31f1 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -162,7 +162,7 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
${GUILE_EXECUTABLE} -e '\(@@ \(guild\) main\)' -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
DEPENDS ${guile_depends}
MAIN_DEPENDENCY ${source_file_abs_path}
- )
+ )
ENDFOREACH(source_file)
IF (__DEBUG)
MESSAGE("TARGET_FILES are ${_TARGET_FILES}")
diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake
index 9fc7e46..405c87d 100644
--- a/common/cmake_modules/MakeDistFiles.cmake
+++ b/common/cmake_modules/MakeDistFiles.cmake
@@ -44,7 +44,6 @@ SET(COPY_FROM_BUILD
libgnucash/app-utils/migratable-prefs.xml
libgnucash/app-utils/swig-app-utils-guile.c
libgnucash/app-utils/swig-app-utils-python.c
- libgnucash/app-utils/test/test-load-module
libgnucash/backend/xml/test/test-real-data.sh
gnucash/gnucash.rc
gnucash/overrides/gnucash-make-guids
@@ -55,31 +54,18 @@ SET(COPY_FROM_BUILD
libgnucash/doc/design/gnucash-design.info
libgnucash/engine/iso-4217-currencies.c
libgnucash/engine/swig-engine.c
- libgnucash/engine/test/test-create-account
- libgnucash/engine/test/test-scm-query-import
libgnucash/gnc-module/swig-gnc-module.c
libgnucash/gnc-module/test/mod-bar/swig-bar.c
libgnucash/gnc-module/test/mod-baz/swig-baz.c
libgnucash/gnc-module/test/mod-foo/swig-foo.c
- libgnucash/gnc-module/test/test-gwrapped-c
- libgnucash/gnc-module/test/test-load-deps
- libgnucash/gnc-module/test/test-load-scm
- libgnucash/gnc-module/test/test-scm-dynload
- libgnucash/gnc-module/test/test-scm-init
- libgnucash/gnc-module/test/test-scm-module
- libgnucash/gnc-module/test/test-scm-multi
gnucash/gnome/gnucash.desktop.in
gnucash/gnome/swig-gnome.c
gnucash/gnome-utils/gnc-warnings.c
gnucash/gnome-utils/swig-gnome-utils.c
- gnucash/gnome-utils/test/test-load-module
gnucash/html/swig-gnc-html.c
bindings/python/gnucash_core.c
gnucash/report/report-gnome/swig-report-gnome.c
- gnucash/report/report-gnome/test/test-load-module
gnucash/report/report-system/swig-report-system.c
- gnucash/report/report-system/test/test-load-module
- gnucash/report/stylesheets/test/test-load-module
libgnucash/scm/build-config.scm
common/swig-runtime.h
common/test-core/swig-unittest-support-guile.c
diff --git a/configure.ac b/configure.ac
index c77e51b..a725f93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1777,42 +1777,10 @@ AC_CONFIG_FILES(
dnl # init-commands go here
)
dnl # Shell scripts, to have their shells set
-AC_CONFIG_FILES([libgnucash/app-utils/test/test-load-module],
- [chmod +x libgnucash/app-utils/test/test-load-module])
AC_CONFIG_FILES([libgnucash/backend/xml/test/test-real-data.sh],
[chmod +x libgnucash/backend/xml/test/test-real-data.sh])
AC_CONFIG_FILES([gnucash/test/test-version],
[chmod +x gnucash/test/test-version])
-AC_CONFIG_FILES([libgnucash/engine/test/test-create-account],
- [chmod +x libgnucash/engine/test/test-create-account])
-AC_CONFIG_FILES([libgnucash/engine/test/test-scm-query-import],
- [chmod +x libgnucash/engine/test/test-scm-query-import])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-gwrapped-c],
- [chmod +x libgnucash/gnc-module/test/test-gwrapped-c])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-deps],
- [chmod +x libgnucash/gnc-module/test/test-load-deps])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-scm],
- [chmod +x libgnucash/gnc-module/test/test-load-scm])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-dynload],
- [chmod +x libgnucash/gnc-module/test/test-scm-dynload])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-init],
- [chmod +x libgnucash/gnc-module/test/test-scm-init])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-module],
- [chmod +x libgnucash/gnc-module/test/test-scm-module])
-AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-multi],
- [chmod +x libgnucash/gnc-module/test/test-scm-multi])
-AC_CONFIG_FILES([gnucash/gnome-utils/test/test-load-module],
- [chmod +x gnucash/gnome-utils/test/test-load-module])
-AC_CONFIG_FILES([gnucash/report/locale-specific/us/test/test-load-module],
- [chmod +x gnucash/report/locale-specific/us/test/test-load-module])
-AC_CONFIG_FILES([gnucash/report/report-gnome/test/test-load-module],
- [chmod +x gnucash/report/report-gnome/test/test-load-module])
-AC_CONFIG_FILES([gnucash/report/report-system/test/test-load-module],
- [chmod +x gnucash/report/report-system/test/test-load-module])
-AC_CONFIG_FILES([gnucash/report/stylesheets/test/test-load-module],
- [chmod +x gnucash/report/stylesheets/test/test-load-module])
-AC_CONFIG_FILES([libgnucash/tax/us/test/test-load-module],
- [chmod +x libgnucash/tax/us/test/test-load-module])
# A few files need extra actions at creation time
AC_CONFIG_FILES([gnucash/overrides/gnucash-make-guids], [chmod u+x gnucash/overrides/gnucash-make-guids])
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 647c61c..eab5563 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -27,9 +27,22 @@ SET(GNOME_UTILS_GUI_TEST_LIBS
# GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
# GNOME_UTILS_GUI_TEST_LIBS
#
+SET(GUILE_DEPENDS
+ test-core
+ gncmod-test-engine
+ gncmod-app-utils
+ gnc-core-utils
+ gncmod-engine
+)
+
+GNC_ADD_SCHEME_TARGETS(scm-test-load-gnome-utils-module
+ "test-load-gnome-utils-module.scm"
+ "gnucash/reports"
+ "${GUILE_DEPENDS}"
+ FALSE
+)
-GNC_ADD_SCHEME_TEST(test-load-module-gnome-utils test-load-module.in)
+GNC_ADD_SCHEME_TESTS(test-load-gnome-utils-module.scm)
-CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
-SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt Makefile.am test-gnc-recurrence.c test-link-module.c test-load-module.in)
+SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt Makefile.am test-gnc-recurrence.c test-link-module.c test-load-report-gnome-module.scm)
diff --git a/gnucash/gnome-utils/test/Makefile.am b/gnucash/gnome-utils/test/Makefile.am
index f06d47b..1d88c2e 100644
--- a/gnucash/gnome-utils/test/Makefile.am
+++ b/gnucash/gnome-utils/test/Makefile.am
@@ -1,5 +1,5 @@
TESTS = \
- test-link-module test-load-module
+ test-link-module ${SCM_TESTS}
# The following tests are nice, but have absolutely no place in an
# automated testing system.
@@ -67,8 +67,17 @@ test_link_module_LDADD = \
${GLIB_LIBS} \
${top_builddir}/libgnucash/gnc-module/libgnc-module.la
+SCM_TESTS = test-load-gnome-utils-module
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile
+ echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+ echo 'export GNC_UNINSTALLED=yes;' >> $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+ chmod a+x $@
+
EXTRA_DIST = \
- test-load-module \
+ ${SCM_TEST_SRCS} \
CMakeLists.txt
testit:
diff --git a/gnucash/gnome-utils/test/test-load-module.in b/gnucash/gnome-utils/test/test-load-gnome-utils-module.scm
similarity index 89%
rename from gnucash/gnome-utils/test/test-load-module.in
rename to gnucash/gnome-utils/test/test-load-gnome-utils-module.scm
index 6d214ac..530eb66 100755
--- a/gnucash/gnome-utils/test/test-load-module.in
+++ b/gnucash/gnome-utils/test/test-load-gnome-utils-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0
-!#
-
(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
diff --git a/gnucash/register/register-core/test/Makefile.am b/gnucash/register/register-core/test/Makefile.am
index 84387df..b9b3407 100644
--- a/gnucash/register/register-core/test/Makefile.am
+++ b/gnucash/register/register-core/test/Makefile.am
@@ -1,6 +1,5 @@
TESTS = \
test-link-module
-# test-load-module
#GNC_TEST_DEPS := \
#
@@ -19,6 +18,5 @@ test_link_module_LDADD=\
../libgncmod-register-core.la
EXTRA_DIST = CMakeLists.txt
-# test-load-module
AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/common/test-core -I..
diff --git a/gnucash/register/register-gnome/test/Makefile.am b/gnucash/register/register-gnome/test/Makefile.am
index 2a7a65f..f04642a 100644
--- a/gnucash/register/register-gnome/test/Makefile.am
+++ b/gnucash/register/register-gnome/test/Makefile.am
@@ -1,6 +1,5 @@
TESTS = \
test-link-module
-# test-load-module
#GNC_TEST_DEPS := \
#
@@ -19,6 +18,5 @@ test_link_module_LDADD = \
../libgncmod-register-gnome.la
EXTRA_DIST = CMakeLists.txt
-# test-load-module
AM_CPPFLAGS = -I${top_srcdir}/common/test-core -I.. ${GLIB_CFLAGS}
diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt
index f4d351c..d5db185 100644
--- a/gnucash/report/locale-specific/us/test/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/test/CMakeLists.txt
@@ -6,8 +6,19 @@ GNC_ADD_TEST(test-link-module-report-locale-specific-us test-link-module.c
)
# This test not run in the autotools build.
-#GNC_ADD_SCHEME_TEST(test-load-module-report-locale-specific-us
-# test-load-module.in
+#SET(GUILE_DEPENDS
+# gncmod-app-utils
+# gnc-core-utils
+# gnc-module
+# gncmod-engine
#)
+#
+#GNC_ADD_SCHEME_TARGETS(test-load-report-locale-specific-module
+# "test-load-report-locale-specific-module.scm"
+# "gnucash/report"
+# "${GUILE_DEPENDS}"
+# FALSE
+# )
+#GNC_ADD_SCHEME_TESTS(test-load-report-locale-specific-us-module.scm)
-SET_DIST_LIST(test_locale_specific_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-module.in)
\ No newline at end of file
+SET_DIST_LIST(test_locale_specific_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-report-locale-specific-module.scm)
diff --git a/gnucash/report/locale-specific/us/test/test-load-module.in b/gnucash/report/locale-specific/us/test/test-load-report-locale-specific-module.scm
similarity index 91%
rename from gnucash/report/locale-specific/us/test/test-load-module.in
rename to gnucash/report/locale-specific/us/test/test-load-report-locale-specific-module.scm
index f78ce92..e1e1b0a 100755
--- a/gnucash/report/locale-specific/us/test/test-load-module.in
+++ b/gnucash/report/locale-specific/us/test/test-load-report-locale-specific-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0
-!#
-
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
@@ -16,4 +12,3 @@ exec ${GUILE} -s $0
(begin
(display "failed\n")
(exit -1)))
-
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index a20af2f..7005e96 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -9,11 +9,21 @@ GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
REPORT_GNOME_TEST_INCLUDE_DIRS REPORT_GNOME_TEST_LIBS
)
-GNC_ADD_SCHEME_TEST(test-load-module-report-gnome
- test-load-module.in
+SET(GUILE_DEPENDS
+ scm-app-utils
+ gncmod-gnome-utils
+ gnc-module
+ gncmod-engine
+ gncmod-report-gnome
)
-CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
+GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module
+ "test-load-report-gnome-module.scm"
+ "gnucash/reports"
+ "${GUILE_DEPENDS}"
+ FALSE
+)
+GNC_ADD_SCHEME_TESTS(test-load-report-gnome-module.scm)
-SET_DIST_LIST(test_report_gnome_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-module.in)
+SET_DIST_LIST(test_report_gnome_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-report-gnome-module.scm)
diff --git a/gnucash/report/report-gnome/test/Makefile.am b/gnucash/report/report-gnome/test/Makefile.am
index 648f412..fb66d7b 100644
--- a/gnucash/report/report-gnome/test/Makefile.am
+++ b/gnucash/report/report-gnome/test/Makefile.am
@@ -18,7 +18,7 @@ LDADD = \
TESTS = \
test-link-module \
- test-load-module
+ ${SCM_TESTS}
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
--gnc-module-dir ${top_builddir}/libgnucash/app-utils \
@@ -60,6 +60,15 @@ TESTS_ENVIRONMENT = \
$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+SCM_TESTS = test-load-report-gnome-module
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile
+ echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+ echo 'export GNC_UNINSTALLED=yes;' >> $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+ chmod a+x $@
+
check_PROGRAMS = test-link-module
-EXTRA_DIST = test-load-module CMakeLists.txt
+EXTRA_DIST = ${SCM_TEST_SRCS} CMakeLists.txt
diff --git a/gnucash/report/report-gnome/test/test-load-module.in b/gnucash/report/report-gnome/test/test-load-report-gnome-module.scm
similarity index 100%
rename from gnucash/report/report-gnome/test/test-load-module.in
rename to gnucash/report/report-gnome/test/test-load-report-gnome-module.scm
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index fc03bc7..e76d828 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -10,6 +10,7 @@ GNC_ADD_TEST_WITH_GUILE(test-link-module-report-system test-link-module.c
)
SET(scm_test_report_system_SOURCES
+ test-load-report-system-module.scm
test-collectors.scm
test-list-extras.scm
test-report-utilities.scm
@@ -17,7 +18,6 @@ SET(scm_test_report_system_SOURCES
)
GNC_ADD_SCHEME_TESTS(${scm_test_report_system_SOURCES})
-GNC_ADD_SCHEME_TEST(test-load-module-report-system test-load-module.in)
GNC_ADD_SCHEME_TARGETS(scm-test-report-system
"test-extras.scm"
@@ -33,7 +33,13 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2
FALSE
)
-CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
-SET_DIST_LIST(test_report_system_DIST CMakeLists.txt Makefile.am test-collectors.scm test-extras.scm test-link-module.c
- test-load-module.in test-report-utilities.scm test-list-extras.scm)
+SET_DIST_LIST(test_report_system_DIST
+ CMakeLists.txt
+ Makefile.am
+ test-collectors.scm
+ test-extras.scm
+ test-link-module.c
+ test-report-utilities.scm
+ test-list-extras.scm
+)
diff --git a/gnucash/report/report-system/test/Makefile.am b/gnucash/report/report-system/test/Makefile.am
index fcdd1fe..b79dadc 100644
--- a/gnucash/report/report-system/test/Makefile.am
+++ b/gnucash/report/report-system/test/Makefile.am
@@ -15,10 +15,10 @@ LDADD = \
TESTS = \
test-link-module \
- test-load-module \
$(SCM_TESTS)
SCM_TESTS = \
+ test-load-report-system-module \
test-collectors \
test-list-extras \
test-report-utilities
@@ -74,7 +74,6 @@ check_PROGRAMS = test-link-module
SCM_TEST_HELPERS = test-extras.scm
EXTRA_DIST = \
- test-load-module \
$(SCM_TEST_HELPERS) \
$(SCM_TEST_SRCS) \
CMakeLists.txt
diff --git a/gnucash/report/report-system/test/test-load-module.in b/gnucash/report/report-system/test/test-load-report-system-module.scm
similarity index 91%
rename from gnucash/report/report-system/test/test-load-module.in
rename to gnucash/report/report-system/test/test-load-report-system-module.scm
index c4c3f42..ea77251 100755
--- a/gnucash/report/report-system/test/test-load-module.in
+++ b/gnucash/report/report-system/test/test-load-report-system-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s "$0"
-!#
-
(debug-enable 'debug)
(debug-enable 'backtrace)
@@ -23,7 +19,3 @@ exec ${GUILE} -s "$0"
(begin
(display "failed\n")
(exit -1)))
-
-
-
-
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 6840203..0692020 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -1,17 +1,30 @@
SET(scm_test_standard_reports_SOURCES
test-cash-flow.scm
test-cashflow-barchart.scm
+ test-standard-category-report.scm
+ test-standard-net-barchart.scm
+ test-standard-net-linechart.scm
+)
+
+SET(scm_test_report_SUPPORT
test-generic-category-report.scm
test-generic-net-barchart.scm
test-generic-net-linechart.scm
-)
+ )
+
-GNC_ADD_SCHEME_TESTS(${scm_test_standard_reports_SOURCES})
+GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")
+GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
+ "${scm_test_report_SUPPORT}"
+ "gnucash/report/standard-reports/test"
+ "scm-gnc-module;scm-test-report-system;scm-standard-reports;scm-report-stylesheets-2"
+ FALSE
+ )
GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
"${scm_test_standard_reports_SOURCES}"
gnucash/report/standard-reports/test
- "scm-gnc-module;scm-test-report-system;scm-standard-reports;scm-report-stylesheets-2"
+ scm-test-standard-support
FALSE
)
diff --git a/gnucash/report/standard-reports/test/Makefile.am b/gnucash/report/standard-reports/test/Makefile.am
index 78ebd09..6a14249 100644
--- a/gnucash/report/standard-reports/test/Makefile.am
+++ b/gnucash/report/standard-reports/test/Makefile.am
@@ -7,6 +7,10 @@ SCM_TESTS = \
test-standard-net-barchart \
test-standard-net-linechart
+# test-generic-category-report.scm,test-generic-net-barchart, and
+# test-generic-net-linechart are support files used by the respective
+# test-standard-*
+
SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
GNC_TEST_DEPS = \
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index bcf97c1..5d58607 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -1,6 +1,24 @@
-CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
-GNC_ADD_SCHEME_TEST(test-load-module-report-stylesheets
- test-load-module.in
+SET(GUILE_DEPENDS
+ test-core
+ gncmod-app-utils
+ gnc-core-utils
+ gnc-module
+ gncmod-engine
+ gncmod-backend-xml
+ gncmod-backend-xml
+ gncmod-gnome-utils
+ gncmod-html
+ gncmod-report-system
+ gncmod-report-gnome
)
-SET_DIST_LIST(test_stylesheets_DIST CMakeLists.txt Makefile.am test-load-module.in)
\ No newline at end of file
+GNC_ADD_SCHEME_TARGETS(scm-test-load-report-stylesheets-module
+ "test-load-report-stylesheets-module.scm"
+ "gnucash/report"
+ "${GUILE_DEPENDS}"
+ FALSE
+ )
+
+GNC_ADD_SCHEME_TESTS("test-load-report-stylesheets-module.scm")
+
+SET_DIST_LIST(test_stylesheets_DIST CMakeLists.txt Makefile.am test-load-report-stylesheets-module.scm)
diff --git a/gnucash/report/stylesheets/test/Makefile.am b/gnucash/report/stylesheets/test/Makefile.am
index f3f5c02..998140d 100644
--- a/gnucash/report/stylesheets/test/Makefile.am
+++ b/gnucash/report/stylesheets/test/Makefile.am
@@ -1,4 +1,4 @@
-TESTS=test-load-module
+TESTS = ${SCM_TESTS}
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
--gnc-module-dir ${top_builddir}/libgnucash/app-utils \
@@ -35,4 +35,15 @@ TESTS_ENVIRONMENT = \
GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
-EXTRA_DIST = test-load-module CMakeLists.txt
+SCM_TESTS = test-load-report-stylesheets-module
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile
+ echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+ echo 'export GNC_UNINSTALLED=yes;' >> $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+ chmod a+x $@
+
+EXTRA_DIST = \
+ ${SCM_TEST_SRCS} \
+ CMakeLists.txt
diff --git a/gnucash/report/stylesheets/test/test-load-module.in b/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
similarity index 92%
rename from gnucash/report/stylesheets/test/test-load-module.in
rename to gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
index 8a58509..2217dba 100755
--- a/gnucash/report/stylesheets/test/test-load-module.in
+++ b/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s "$0"
-!#
-
(setenv "GNC_UNINSTALLED" "1")
(display " testing stylesheet module load ... ")
(use-modules (gnucash unittest-support))
@@ -17,15 +13,11 @@ exec ${GUILE} -s "$0"
(gnc:module-system-init)
(if (gnc:module-load "gnucash/report/stylesheets" 0)
- (begin
+ (begin
(g-log-remove-handler log-domain handler)
(display "ok\n")
(exit 0))
- (begin
+ (begin
(g-log-remove-handler log-domain handler)
(display "failed\n")
(exit -1)))
-
-
-
-
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 35bc187..b99b936 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -27,11 +27,34 @@ 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-app-utils test-load-module.in)
+SET(GUILE_DEPENDS
+ scm-app-utils
+ gnc-core-utils
+ gnc-module
+ gncmod-engine
+ gncmod-backend-xml
+ gncmod-backend-xml
+)
+
+GNC_ADD_SCHEME_TARGETS(scm-test-load-app-utils-module
+ "test-load-app-utils-module.scm"
+ "gnucash/reports"
+ "${GUILE_DEPENDS}"
+ FALSE
+)
+
+GNC_ADD_SCHEME_TESTS("test-load-app-utils-module.scm")
# Doesn't work yet:
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)
-
-SET_DIST_LIST(test_app_utils_DIST CMakeLists.txt Makefile.am test-exp-parser.c test-link-module.c test-load-module.in
- test-print-parse-amount.cpp test-print-queries.cpp test-scm-query-string.cpp test-sx.cpp ${test_app_utils_SOURCES})
+SET_DIST_LIST(test_app_utils_DIST
+ CMakeLists.txt
+ Makefile.am
+ test-exp-parser.c
+ test-link-module.c
+ test-print-parse-amount.cpp
+ test-print-queries.cpp
+ test-scm-query-string.cpp
+ test-sx.cpp
+ ${test_app_utils_SOURCES}
+)
diff --git a/libgnucash/app-utils/test/Makefile.am b/libgnucash/app-utils/test/Makefile.am
index a5aefc8..5380cc3 100644
--- a/libgnucash/app-utils/test/Makefile.am
+++ b/libgnucash/app-utils/test/Makefile.am
@@ -9,8 +9,8 @@ check_PROGRAMS = \
test-app-utils
TESTS = \
- test-load-module \
- ${check_PROGRAMS}
+ ${check_PROGRAMS} \
+ ${SCM_TESTS}
test_scm_query_string_SOURCES = test-scm-query-string.cpp
test_sx_SOURCES = test-sx.cpp
@@ -47,8 +47,8 @@ LDADD = \
${GUILE_LIBS}
EXTRA_DIST += \
- test-load-module \
test-print-queries.cpp \
+ ${SCM_TEST_SRCS} \
CMakeLists.txt
AM_CPPFLAGS = \
@@ -73,3 +73,12 @@ test_app_utils_CXXFLAGS = \
-I${top_srcdir}/${MODULEPATH}/ \
-DTESTPROG=test_app_utils \
${GLIB_CFLAGS}
+
+SCM_TESTS = test-load-app-utils-module
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
+
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile
+ echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+ echo 'export GNC_UNINSTALLED=yes;' >> $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+ chmod a+x $@
diff --git a/libgnucash/app-utils/test/test-load-module.in b/libgnucash/app-utils/test/test-load-app-utils-module.scm
similarity index 97%
rename from libgnucash/app-utils/test/test-load-module.in
rename to libgnucash/app-utils/test/test-load-app-utils-module.scm
index 5d6bb0e..6bf102f 100755
--- a/libgnucash/app-utils/test/test-load-module.in
+++ b/libgnucash/app-utils/test/test-load-app-utils-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s "$0"
-!#
-
(define exit-code 0)
(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 10a6d62..0ffee43 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -15,8 +15,6 @@ MACRO(ADD_ENGINE_TEST _TARGET _SOURCE_FILES)
GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)
ENDMACRO()
-CONFIGURE_FILE(test-scm-query-import.in test-scm-query-import @ONLY)
-CONFIGURE_FILE(test-create-account.in test-create-account @ONLY)
# Not via macro because of unique link requirements
ADD_EXECUTABLE(test-link EXCLUDE_FROM_ALL test-link.c)
@@ -210,23 +208,34 @@ GNC_ADD_TEST(test-import-map "${test_import_map_SOURCES}"
GNC_ADD_TEST_WITH_GUILE(test-scm-query test-scm-query.cpp ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)
############################
-GNC_ADD_SCHEME_TEST(scm-test-account test-account.scm)
-GNC_ADD_SCHEME_TEST(scm-test-create-account test-create-account.scm)
-GNC_ADD_SCHEME_TEST(scm-test-test-extra test-test-extras.scm)
-GNC_ADD_SCHEME_TEST(scm-test-split test-split.scm)
-# This check not run in autotools. Doesn't pass.
-#GNC_ADD_SCHEME_TEST(scm-test-scm-query-import test-scm-query-import.scm)
-SET(engine_test_SCHEME test-extras.scm)
+SET(engine_test_SCHEME
+ test-account.scm
+ test-create-account.scm
+ test-test-extras.scm
+ test-split.scm
+ test-test-extras.scm
+ )
+
+#LIST(APPEND engine_test_SCHEME test-scm-query-import.scm) Fails
SET(GUILE_DEPENDS scm-app-utils scm-scm)
+GNC_ADD_SCHEME_TARGETS(scm-test-engine-extras
+ "test-extras.scm"
+ "gnucash/engine/test/"
+ "${GUILE_DEPENDS}"
+ FALSE
+ )
+
GNC_ADD_SCHEME_TARGETS(scm-test-engine
"${engine_test_SCHEME}"
- gnucash/engine/test
- "${GUILE_DEPENDS}"
+ ""
+ "${GUILE_DEPENDS};scm-test-engine-extras"
FALSE
-)
+ )
+
+GNC_ADD_SCHEME_TESTS("${engine_test_SCHEME}")
SET(test_engine_SOURCES_DIST
dummy.cpp
@@ -292,8 +301,6 @@ SET(test_engine_SCHEME_DIST
SET(test_engine_EXTRA_DIST
README
- test-create-account.in
- test-scm-query-import.in
)
SET_DIST_LIST(test_engine_DIST CMakeLists.txt Makefile.am
diff --git a/libgnucash/engine/test/Makefile.am b/libgnucash/engine/test/Makefile.am
index 6210fbb..94a7a33 100644
--- a/libgnucash/engine/test/Makefile.am
+++ b/libgnucash/engine/test/Makefile.am
@@ -56,9 +56,11 @@ TEST_GROUP_2 = \
test-vendor
SCM_TESTS = \
+ test-create-account \
test-test-extras \
test-account \
test-split
+# test-scm-query-import \ Fails
SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
@@ -107,7 +109,7 @@ TESTS_ENVIRONMENT = \
check_PROGRAMS = ${TEST_GROUP_1} ${TEST_GROUP_2}
-TESTS = ${TEST_GROUP_1} test-create-account ${TEST_GROUP_2} ${SCM_TESTS}
+TESTS = ${TEST_GROUP_1} ${TEST_GROUP_2} ${SCM_TESTS}
test_link_SOURCES = test-link.c
test_link_LDADD = ../libgncmod-engine.la \
@@ -120,10 +122,6 @@ endif
SCM_TEST_HELPERS = test-extras.scm
EXTRA_DIST += \
- test-create-account \
- test-create-account.scm \
- test-scm-query-import \
- test-scm-query-import.scm \
$(SCM_TEST_HELPERS) \
$(SCM_TEST_SRCS) \
CMakeLists.txt
diff --git a/libgnucash/engine/test/test-create-account.in b/libgnucash/engine/test/test-create-account.in
deleted file mode 100755
index a9db9aa..0000000
--- a/libgnucash/engine/test/test-create-account.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!@SHELL@
-${GUILE} -l $SRCDIR/test-create-account.scm -c "(exit (run-test))"
diff --git a/libgnucash/engine/test/test-scm-query-import.in b/libgnucash/engine/test/test-scm-query-import.in
deleted file mode 100755
index 5094d76..0000000
--- a/libgnucash/engine/test/test-scm-query-import.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!@SHELL@
-${GUILE} -l $SRCDIR/test-scm-query-import.scm -c "(exit (run-test))"
diff --git a/libgnucash/gnc-module/CMakeLists.txt b/libgnucash/gnc-module/CMakeLists.txt
index 250fd55..ae9bd03 100644
--- a/libgnucash/gnc-module/CMakeLists.txt
+++ b/libgnucash/gnc-module/CMakeLists.txt
@@ -54,7 +54,7 @@ SET(GUILE_DEPENDS gnc-module)
GNC_ADD_SCHEME_TARGETS(scm-gnc-module
"${gnc_module_SCHEME}"
- ${GUILE_OUTPUT_DIR}
+ ${GUILE_OUTPUT_DIR}
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
index 7bc44d7..a6ab0ee 100644
--- a/libgnucash/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -34,16 +34,6 @@ ENDFUNCTION()
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)
-
-RUN_TEST_WITH_GUILE(test-load-deps ${CMAKE_CURRENT_SOURCE_DIR}/test-load-deps.in)
-
-RUN_TEST_WITH_GUILE(test-scm-init ${CMAKE_CURRENT_SOURCE_DIR}/test-scm-init.in)
-
-RUN_TEST_WITH_GUILE(test-scm-multi ${CMAKE_CURRENT_SOURCE_DIR}/test-scm-multi.in)
-
-RUN_TEST_WITH_GUILE(test-scm-dynload ${CMAKE_CURRENT_SOURCE_DIR}/test-scm-dynload.in)
-
GNC_ADD_TEST_WITH_GUILE(test-modsysver test-modsysver.c
GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS
)
@@ -64,31 +54,36 @@ GNC_ADD_TEST(test-dynload test-dynload.c
LIBDIR=${_LIBDIR}
)
-SET(GUILE ${GUILE_EXECUTABLE})
-CONFIGURE_FILE(test-gwrapped-c.in test-gwrapped-c @ONLY)
-CONFIGURE_FILE(test-scm-module.in test-scm-module @ONLY)
-CONFIGURE_FILE(test-load-deps.in test-load-deps @ONLY)
-CONFIGURE_FILE(test-load-scm.in test-load-scm @ONLY)
-CONFIGURE_FILE(test-scm-dynload.in test-scm-dynload @ONLY)
-CONFIGURE_FILE(test-scm-init.in test-scm-init @ONLY)
-CONFIGURE_FILE(test-scm-multi.in test-scm-multi @ONLY)
-
-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};GNC_MODULE_PATH=${CMAKE_BINARY_DIR}/lib/gnucash/test")
- ENDIF()
- ADD_TEST(NAME ${_TARGET}
- COMMAND ${CMAKE_COMMAND_TMP}
- ${SHELL} ${_SOURCE_FILE}
+SET(test_gnc_module_SCHEME
+ test-gnc-module-scm-init.scm
+ test-gnc-module-load-scm.scm
+ test-gnc-module-swigged-c.scm
+ test-gnc-module-load-deps.scm
+ test-gnc-module-scm-dynload.scm
+ test-gnc-module-scm-module.scm
+ test-gnc-module-scm-multi.scm
)
- 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)
+SET(GUILE_DEPENDS gnc-module scm-test-core scm-mod-foo scm-mod-baz)
-RUN_GUILE_SHELL_TEST(test-scm-module ${CMAKE_CURRENT_BINARY_DIR}/test-scm-module)
+GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm
+ "${test_gnc_module_SCHEME}"
+ "gnucash/gnc-modules/test"
+ "${GUILE_DEPENDS}"
+ TRUE
+ )
+
+GNC_ADD_SCHEME_TESTS("${test_gnc_module_SCHEME}")
+IF(NOT WIN32)
+ # This little dance is needed because gnc_module_init will assert if
+ # it finds libgncmod_futuremod.so outside of a test that expects it.
+ GET_GUILE_ENV()
+ SET(_GNC_MODULE_PATH "${CMAKE_BINARY_DIR}/lib:${CMAKE_BINARY_DIR}/lib/gnucash:${CMAKE_BINARY_DIR}/lib/gnucash/test")
+ FOREACH(test_file ${test_gnc_module_SCHEME})
+ GET_FILENAME_COMPONENT(basename ${test_file} NAME_WE)
+ SET_TESTS_PROPERTIES(${basename} PROPERTIES ENVIRONMENT "${GUILE_ENV};GNC_MODULE_PATH=${_GNC_MODULE_PATH}")
+ ENDFOREACH()
+ENDIF()
SET(test_gnc_module_SOURCE_DIST
test-agedver.c
@@ -100,13 +95,7 @@ SET(test_gnc_module_SOURCE_DIST
SET(test_gnc_module_EXTRA_DIST
README
- test-gwrapped-c.in
- test-load-deps.in
- test-load-scm.in
- test-scm-dynload.in
- test-scm-init.in
- test-scm-module.in
- test-scm-multi.in
+ ${test_gnc_module_SCHEME}
)
SET_LOCAL_DIST(test_gnc_module_DIST_local CMakeLists.txt Makefile.am README ${test_gnc_module_SOURCE_DIST} ${test_gnc_module_EXTRA_DIST})
diff --git a/libgnucash/gnc-module/test/Makefile.am b/libgnucash/gnc-module/test/Makefile.am
index 13b0188..05d31c3 100644
--- a/libgnucash/gnc-module/test/Makefile.am
+++ b/libgnucash/gnc-module/test/Makefile.am
@@ -14,17 +14,22 @@ AM_CPPFLAGS = \
TESTS = \
test-load-c \
- test-load-scm \
- test-gwrapped-c \
- test-scm-module \
- test-scm-multi \
- test-load-deps \
test-modsysver \
test-incompatdep \
test-agedver \
test-dynload \
- test-scm-dynload \
- test-scm-init
+ ${SCM_TESTS}
+
+SCM_TESTS = \
+ test-gnc-module-load-scm \
+ test-gnc-module-swigged-c \
+ test-gnc-module-scm-module \
+ test-gnc-module-scm-multi \
+ test-gnc-module-load-deps \
+ test-gnc-module-scm-dynload \
+ test-gnc-module-scm-init
+
+SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
GNC_TEST_DEPS = \
--gnc-module-dir ${top_builddir}/libgnucash/gnc-module \
@@ -58,14 +63,14 @@ check_PROGRAMS = \
test_dynload_LDFLAGS = ${GUILE_LIBS}
+$(SCM_TESTS): %: $(srcdir)/%.scm Makefile
+ echo 'export GNC_BUILDDIR="${abs_top_builddir}";' > $@
+ echo 'export GNC_UNINSTALLED=yes;' >> $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' >> $@
+ chmod a+x $@
+
EXTRA_DIST = \
- test-gwrapped-c \
- test-load-deps \
- test-load-scm \
- test-scm-dynload \
- test-scm-init \
- test-scm-module \
- test-scm-multi \
+ ${SCM_TEST_SRCS} \
CMakeLists.txt
foo:
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 776150c..17c3c56 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -27,6 +27,13 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
${GUILE_INCLUDE_DIRS}
)
+GNC_ADD_SCHEME_TARGETS(scm-mod-baz
+ gnucash/baz.scm
+ "gnucash"
+ gncmodbaz
+ TRUE
+ )
+
SET_TARGET_PROPERTIES(baz gncmodbaz PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index 2b5d1ce..0a6d37f 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -21,6 +21,13 @@ TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
${GUILE_INCLUDE_DIRS}
)
+GNC_ADD_SCHEME_TARGETS(scm-mod-foo
+ gnucash/foo.scm
+ "gnucash"
+ gncmodfoo
+ TRUE
+ )
+
SET_TARGET_PROPERTIES(foo gncmodfoo PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/gnucash/test
diff --git a/libgnucash/gnc-module/test/test-load-deps.in b/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
similarity index 81%
rename from libgnucash/gnc-module/test/test-load-deps.in
rename to libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
index 9af6410..d88791f 100755
--- a/libgnucash/gnc-module/test/test-load-deps.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
@@ -1,8 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0 "$@"
-!#
-;; test-load-deps.scm : load gnc-mod-baz, which depends on gnc-mod-foo
-
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -25,7 +20,3 @@ exec ${GUILE} -s $0 "$@"
(g-log-remove-handler log-domain handler)
(exit 0)
-
-;; Local Variables:
-;; mode: scheme
-;; End:
diff --git a/libgnucash/gnc-module/test/test-load-scm.in b/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
similarity index 88%
copy from libgnucash/gnc-module/test/test-load-scm.in
copy to libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
index 61eddeb..d67fb19 100755
--- a/libgnucash/gnc-module/test/test-load-scm.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0 "$@"
-!#
-
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -15,6 +11,4 @@ exec ${GUILE} -s $0 "$@"
(gnc:module-system-init)
(gnc:module-load "gnucash/foo" 0)
(g-log-remove-handler log-domain handler)
-;; Local Variables:
-;; mode: scheme
-;; End:
+(exit 0)
diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
new file mode 100755
index 0000000..5a81132
--- /dev/null
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
@@ -0,0 +1,5 @@
+(if (or (string=? (version) "1.3")
+ (string=? (version) "1.3.4"))
+ (dynamic-link "libgnc-module.so")
+ (dynamic-link "libgnc-module"))
+(exit 0)
diff --git a/libgnucash/gnc-module/test/test-scm-init.in b/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
similarity index 79%
rename from libgnucash/gnc-module/test/test-scm-init.in
rename to libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
index 9825da7..c18f994 100755
--- a/libgnucash/gnc-module/test/test-scm-init.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
@@ -1,8 +1,3 @@
-#! @SHELL@
-echo " test-scm-init: testing Scheme-only module system init. ";
-exec ${GUILE} -s $0 "$@"
-!#
-
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -17,7 +12,4 @@ exec ${GUILE} -s $0 "$@"
(gnc:module-system-init)
(g-log-remove-handler log-domain handler)
-
-;; LocalVariables:
-;; mode: scheme
-;; End:
+(exit 0)
diff --git a/libgnucash/gnc-module/test/test-load-scm.in b/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
similarity index 83%
copy from libgnucash/gnc-module/test/test-load-scm.in
copy to libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
index 61eddeb..ccfd804 100755
--- a/libgnucash/gnc-module/test/test-load-scm.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0 "$@"
-!#
-
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -13,8 +9,6 @@ exec ${GUILE} -s $0 "$@"
(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
-(gnc:module-load "gnucash/foo" 0)
+(if (not (gnc:module-load "gnucash/foo" 0)) (exit -1))
+(exit (foo:scheme-hello))
(g-log-remove-handler log-domain handler)
-;; Local Variables:
-;; mode: scheme
-;; End:
diff --git a/libgnucash/gnc-module/test/test-scm-multi.in b/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
similarity index 86%
rename from libgnucash/gnc-module/test/test-scm-multi.in
rename to libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
index c0600a2..bc938f2 100755
--- a/libgnucash/gnc-module/test/test-scm-multi.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
@@ -1,6 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0 "$@"
-!#
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -12,7 +9,7 @@ exec ${GUILE} -s $0 "$@"
(define handler (test-set-checked-handler log-domain log-level check))
(use-modules (gnucash gnc-module))
-(gnc:module-system-init)
+(gnc:module-system-init)
(gnc:module-load "gnucash/foo" 0)
(foo-hello)
(foo:scheme-hello)
@@ -23,7 +20,4 @@ exec ${GUILE} -s $0 "$@"
(bar:scheme-hello)
(g-log-remove-handler log-domain handler)
-
-;; Local Variables:
-;; mode: scheme
-;; End:
+(exit 0)
diff --git a/libgnucash/gnc-module/test/test-load-scm.in b/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
similarity index 88%
rename from libgnucash/gnc-module/test/test-load-scm.in
rename to libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
index 61eddeb..913b49f 100755
--- a/libgnucash/gnc-module/test/test-load-scm.in
+++ b/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s $0 "$@"
-!#
-
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
@@ -14,7 +10,5 @@ exec ${GUILE} -s $0 "$@"
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
(gnc:module-load "gnucash/foo" 0)
+(exit (eq? 10 (foo-hello)))
(g-log-remove-handler log-domain handler)
-;; Local Variables:
-;; mode: scheme
-;; End:
diff --git a/libgnucash/gnc-module/test/test-gwrapped-c.in b/libgnucash/gnc-module/test/test-gwrapped-c.in
deleted file mode 100755
index b3dacaf..0000000
--- a/libgnucash/gnc-module/test/test-gwrapped-c.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @SHELL@
-${GUILE} -c "(use-modules (gnucash unittest-support))
- (define log-domain \"gnc.module\")
- (define check (new-TestErrorStruct))
- (define log-level (G-LOG-LEVEL-WARNING))
- (define msg \"Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
- (TestErrorStruct-log-domain-set check log-domain)
- (TestErrorStruct-log-level-set check log-level)
- (TestErrorStruct-msg-set check msg)
- (define handler (test-set-checked-handler log-domain log-level check))
- (use-modules (gnucash gnc-module))
- (gnc:module-system-init)
- (gnc:module-load \"gnucash/foo\" 0)
- (exit (eq? 10 (foo-hello)))
- (g-log-remove-handler log-domain handler)"
diff --git a/libgnucash/gnc-module/test/test-scm-dynload.in b/libgnucash/gnc-module/test/test-scm-dynload.in
deleted file mode 100755
index b5d6a41..0000000
--- a/libgnucash/gnc-module/test/test-scm-dynload.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @SHELL@
-echo " test-scm-dynload: testing dynamic-link of libgnc-module from Scheme.";
-exec ${GUILE} -s $0 "$@"
-!#
-
-(if (or (string=? (version) "1.3")
- (string=? (version) "1.3.4"))
- (dynamic-link "libgnc-module.so")
- (dynamic-link "libgnc-module"))
-
-;; LocalVariables:
-;; mode: scheme
-;; End:
-
-
diff --git a/libgnucash/gnc-module/test/test-scm-module.in b/libgnucash/gnc-module/test/test-scm-module.in
deleted file mode 100755
index efac218..0000000
--- a/libgnucash/gnc-module/test/test-scm-module.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @SHELL@
-${GUILE} -c "(use-modules (gnucash unittest-support))
- (define log-domain \"gnc.module\")
- (define check (new-TestErrorStruct))
- (define log-level (G-LOG-LEVEL-WARNING))
- (define msg \"Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n\")
- (TestErrorStruct-log-domain-set check log-domain)
- (TestErrorStruct-log-level-set check log-level)
- (TestErrorStruct-msg-set check msg)
- (define handler (test-set-checked-handler log-domain log-level check))
- (use-modules (gnucash gnc-module))
- (gnc:module-system-init)
- (if (not (gnc:module-load \"gnucash/foo\" 0)) (exit -1))
- (exit (foo:scheme-hello))
- (g-log-remove-handler log-domain handler)"
diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt
index df3d867..acb8a5d 100644
--- a/libgnucash/tax/us/test/CMakeLists.txt
+++ b/libgnucash/tax/us/test/CMakeLists.txt
@@ -6,6 +6,17 @@ GNC_ADD_TEST(test-link-module-tax-us test-link-module.c
)
# This test not run in autotools build.
-#GNC_ADD_SCHEME_TEST(test-load-module-tax-us test-load-module.in)
+#SET(GUILE_DEPENDS
+# gnc-core-utils
+# gnc-module
+#)
+#
+#GNC_ADD_SCHEME_TARGETS(scm-test-load-tax-us-module
+# "test-load-tax-us-module.scm"
+# "gnucash/reports"
+# "${GUILE_DEPENDS}"
+# FALSE
+#)
+#GNC_ADD_SCHEME_TEST(test-load-tax-us-module.scm)
-SET_DIST_LIST(test_tax_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-module.in)
\ No newline at end of file
+SET_DIST_LIST(test_tax_us_DIST CMakeLists.txt Makefile.am test-link-module.c test-load-tax-us-module.scm)
diff --git a/libgnucash/tax/us/test/test-load-module.in b/libgnucash/tax/us/test/test-load-tax-us-module.scm
similarity index 87%
rename from libgnucash/tax/us/test/test-load-module.in
rename to libgnucash/tax/us/test/test-load-tax-us-module.scm
index 86a8799..ee2be93 100755
--- a/libgnucash/tax/us/test/test-load-module.in
+++ b/libgnucash/tax/us/test/test-load-tax-us-module.scm
@@ -1,7 +1,3 @@
-#! @SHELL@
-exec ${GUILE} -s "$0"
-!#
-
(display " testing US tax info module load ... ")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 45f38fc..0051314 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -13,6 +13,7 @@ gnucash/gnome-utils/gnc-tree-model-selection.c
libgnucash/app-utils/gnucash/app-utils.scm
libgnucash/app-utils/gnucash/gettext.scm
+libgnucash/app-utils/test/test-load-app-utils-module.scm
libgnucash/core-utils/gnucash/core-utils.scm
libgnucash/engine/gnucash/business-core.scm
libgnucash/engine/gnucash/engine.scm
commit f412795ef21d5982758bceea53161a57127a32ab
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 2 14:46:05 2017 -0700
Remove extraneous parameters from GNC_ADD_SCHEME_TARGETS
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 2d2478d..3ad98bc 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -26,17 +26,12 @@ FUNCTION(MAKE_UNIX_PATH_LIST PATH)
SET(${PATH} ${newpath} PARENT_SCOPE)
ENDFUNCTION()
-FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR
- _GUILE_MODULES _GUILE_LOAD_DIRS
- _GUILE_LIBRARY_DIRS _GUILE_DEPENDS
+FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
SET(__DEBUG FALSE)
IF (__DEBUG)
MESSAGE("Parameters to COMPILE_SCHEME for target ${_TARGET}")
MESSAGE(" SOURCE_FILES: ${_SOURCE_FILES}")
- MESSAGE(" GUILE_MODULES: ${_GUILE_MODULES}")
- MESSAGE(" GUILE_LOAD_DIRS: ${_GUILE_LOAD_DIRS}")
- MESSAGE(" GUILE_LIBRARY_DIRS: ${_GUILE_LIBRARY_DIRS}")
MESSAGE(" GUILE_DEPENDS: ${_GUILE_DEPENDS}")
MESSAGE(" DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}")
ENDIF(__DEBUG)
@@ -92,9 +87,6 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR
SET(_GUILE_LOAD_PATH "${current_srcdir}"
"${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm") # to pick up generated build-config.scm
SET(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
- FOREACH (load_item ${_GUILE_LOAD_DIRS})
- LIST(APPEND _GUILE_LOAD_PATH "${CMAKE_SOURCE_DIR}/${load_item}")
- ENDFOREACH(load_item)
SET(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/2.0)
SET(_GUILE_LOAD_PATH "${current_srcdir}")
@@ -149,7 +141,6 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR
ENDIF(MINGW64)
MAKE_UNIX_PATH_LIST(_GUILE_LOAD_PATH)
MAKE_UNIX_PATH_LIST(_GUILE_LOAD_COMPILED_PATH)
- MAKE_UNIX_PATH_LIST(_GUILE_MODULES)
MAKE_UNIX_PATH_LIST(_GUILE_LD_LIBRARY_PATH)
MAKE_UNIX_PATH_LIST(_GNC_MODULE_PATH)
IF (__DEBUG)
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index 70ccece..9d2e335 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -52,18 +52,12 @@ ENDIF()
SET(test_core_SCHEME unittest-support.scm)
SET(GUILE_OUTPUT_DIR gnucash)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS "")
-SET(GUILE_LIBRARY_DIRS common/test-core libgnucash/engine)
SET(GUILE_DEPENDS test-core-guile)
GNC_ADD_SCHEME_TARGETS(scm-test-core
${test_core_SCHEME}
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 4588de8..084ecb2 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -246,17 +246,11 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION include/gnucash)
# Scheme
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module)
SET(GUILE_DEPENDS gncmod-gnome-utils scm-core-utils scm-gnc-module scm-scm)
GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
gnome-utils.scm
gnucash
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
@@ -265,9 +259,6 @@ GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-2
gnc-menu-extensions.scm
""
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 8334451..9c7e0e3 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -54,17 +54,11 @@ SET(qif_import_SCHEME_2
qif-import.scm
)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module gnucash/gnome)
SET(GUILE_DEPENDS gncmod-qif-import scm-core-utils scm-gnc-module scm-scm)
GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
"${qif_import_SCHEME_2}"
"gnucash/import-export"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
@@ -72,9 +66,6 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
GNC_ADD_SCHEME_TARGETS(scm-qif-import
"${qif_import_SCHEME}"
"qif-import"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index 224ba51..c55e626 100644
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -25,20 +25,11 @@ SET(business_reports_DATA
)
SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils
- gnucash/report/report-system gnucash/report/standard-reports)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils
- libgnucash/scm gnucash/report/business_reports gnucash/report/report-system gnucash/report/standard-reports)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils
- gnucash/report/report-system gnucash/report/standard-reports)
SET(GUILE_DEPENDS scm-business-reports-links scm-standard-reports)
GNC_ADD_SCHEME_TARGETS(scm-business-reports
"${business_reports_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
+ ${GUILE_OUTPUT_DIR}
"${GUILE_DEPENDS}"
TRUE
)
diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
index 6793bb5..97f7211 100644
--- a/gnucash/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@@ -30,19 +30,11 @@ SET(gncmod_local_reports_us_SCHEME_1 taxtxf.scm taxtxf-de_DE.scm)
SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system gnucash/tax/us)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system
- libgnucash/scm libgnucash/tax/us)
-SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils
- gnucash/html gnucash/report/report-system)
SET(GUILE_DEPENDS gncmod-html scm-tax-us-1 scm-tax-us-2 scm-report-system-3)
GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1
"${gncmod_local_reports_us_SCHEME_1}"
gnucash/report
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
@@ -50,9 +42,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1
GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-2
"${gncmod_local_reports_us_SCHEME_2}"
gnucash/report/locale-specific
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-report-locale-specific-1;${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index ab4bc9a..e2362e2 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -54,17 +54,11 @@ SET(report_gnome_SCHEME
)
SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/scm libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/reports/report-system gnucash/report/utility-reports)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/gnc-module libgnucash/engine libgnucash/scm libgnucash/core-utils gnucash/gnome-utils)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report-gnome)
SET(GUILE_DEPENDS gncmod-report-gnome gncmod-engine scm-app-utils scm-gnome-utils scm-core-utils scm-gnc-module scm-scm scm-standard-reports scm-business-reports scm-utility-reports)
GNC_ADD_SCHEME_TARGETS(scm-report-gnome
"${report_gnome_SCHEME}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index 6f0bbef..a589284 100644
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -78,19 +78,11 @@ SET (report_system_SCHEME_3
report.scm
)
-
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils)
SET(GUILE_DEPENDS gncmod-html gncmod-gnome-utils gncmod-report-system scm-app-utils scm-gnome-utils)
-
GNC_ADD_SCHEME_TARGETS(scm-report-system
"${report_system_SCHEME}"
"gnucash/report"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
@@ -98,9 +90,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system
GNC_ADD_SCHEME_TARGETS(scm-report-system-2
"${report_system_SCHEME_2}"
"gnucash/report/report-system"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
scm-report-system
FALSE
)
@@ -108,9 +97,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system-2
GNC_ADD_SCHEME_TARGETS(scm-report-system-3
"${report_system_SCHEME_3}"
""
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
scm-report-system-2
FALSE
)
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index 897517a..fc03bc7 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -22,9 +22,6 @@ GNC_ADD_SCHEME_TEST(test-load-module-report-system test-load-module.in)
GNC_ADD_SCHEME_TARGETS(scm-test-report-system
"test-extras.scm"
gnucash/report/report-system/test
- ""
- ""
- ""
"scm-gnc-module;scm-test-engine;scm-report-system-3"
FALSE
)
@@ -32,9 +29,6 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system
GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2
"${scm_test_report_system_SOURCES}"
gnucash/report/report-system/test
- ""
- ""
- ""
"scm-test-report-system"
FALSE
)
diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
index 2ff9016..fa7be34 100644
--- a/gnucash/report/standard-reports/CMakeLists.txt
+++ b/gnucash/report/standard-reports/CMakeLists.txt
@@ -33,17 +33,11 @@ SET (standard_reports_SCHEME_2
trial-balance.scm
)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system)
SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-gnome-utils scm-report-system scm-report-system-3)
GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1
"${standard_reports_SCHEME}"
"gnucash/report"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-standard-reports-2;${GUILE_DEPENDS}"
TRUE
)
@@ -51,9 +45,6 @@ GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1
GNC_ADD_SCHEME_TARGETS(scm-standard-reports-2
"${standard_reports_SCHEME_2}"
"gnucash/report/standard-reports"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-standard-reports-2-links;${GUILE_DEPENDS}"
TRUE
)
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 6233372..6840203 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -11,9 +11,6 @@ GNC_ADD_SCHEME_TESTS(${scm_test_standard_reports_SOURCES})
GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
"${scm_test_standard_reports_SOURCES}"
gnucash/report/standard-reports/test
- ""
- ""
- ""
"scm-gnc-module;scm-test-report-system;scm-standard-reports;scm-report-stylesheets-2"
FALSE
)
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 0964272..8ca7325 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -48,17 +48,11 @@ SET(stylesheets_SCHEME_2
)
SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils gnucash/report/report-system)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html gnucash/report/report-system)
SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-report-system-3)
GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1
"${stylesheets_SCHEME_1}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
TRUE
)
@@ -66,9 +60,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1
GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-2
"${stylesheets_SCHEME_2}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-report-stylesheets-1;${GUILE_DEPENDS}"
TRUE
)
diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt
index c3221a7..64ffc1e 100644
--- a/gnucash/report/utility-reports/CMakeLists.txt
+++ b/gnucash/report/utility-reports/CMakeLists.txt
@@ -8,19 +8,11 @@ SET(utility_reports_SCHEME
)
SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module
- gnucash/gnome-utils gnucash/report/report-system libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html
- gnucash/report/report-system)
SET(GUILE_DEPENDS scm-utility-reports-links scm-app-utils scm-report-system-3)
GNC_ADD_SCHEME_TARGETS(scm-utility-reports
"${utility_reports_SCHEME}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
TRUE
)
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 3b2a312..db1507c 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -175,17 +175,11 @@ SET(app_utils_SCHEME_3
business-prefs.scm
)
-SET(GUILE_MODULES libgnucash/engine)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module)
SET(GUILE_DEPENDS gncmod-app-utils scm-core-utils scm-engine scm-scm)
GNC_ADD_SCHEME_TARGETS(scm-gettext
gettext.scm
gnucash
- libgnucash/app-utils
- ""
- ""
gncmod-app-utils
FALSE
)
@@ -193,9 +187,6 @@ GNC_ADD_SCHEME_TARGETS(scm-gettext
GNC_ADD_SCHEME_TARGETS(scm-app-utils-1
"${app_utils_SCHEME_1}"
""
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-gettext;${GUILE_DEPENDS}"
FALSE
)
@@ -203,9 +194,6 @@ GNC_ADD_SCHEME_TARGETS(scm-app-utils-1
GNC_ADD_SCHEME_TARGETS(scm-app-utils-2
"${app_utils_SCHEME_2}"
"gnucash"
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
scm-app-utils-1
FALSE
)
@@ -213,9 +201,6 @@ GNC_ADD_SCHEME_TARGETS(scm-app-utils-2
GNC_ADD_SCHEME_TARGETS(scm-app-utils-3
"${app_utils_SCHEME_3}"
""
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
scm-app-utils-2
FALSE
)
diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
index d667b9e..dd4ff00 100644
--- a/libgnucash/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -198,17 +198,11 @@ ENDIF()
SET (core_utils_SCHEME core-utils.scm)
SET(GUILE_OUTPUT_DIR gnucash)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/core-utils)
-SET(GUILE_LIBRARY_DIRS libgnucash/core-utils)
SET(GUILE_DEPENDS gnc-core-utils)
GNC_ADD_SCHEME_TARGETS(scm-core-utils
"${core_utils_SCHEME}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index 1b2f626..b7f4fb0 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -288,18 +288,12 @@ IF (WITH_SQL)
LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
ENDIF(WITH_SQL)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/gnc-module)
-SET(GUILE_LIBRARY_DIRS libgnucash/gnc-module)
SET(GUILE_DEPENDS ${BACKEND_DEPENDS} gnc-module gncmod-engine scm-gnc-module)
GNC_ADD_SCHEME_TARGETS(scm-engine-0
"${engine_SCHEME_0}"
gnucash
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
@@ -307,9 +301,6 @@ GNC_ADD_SCHEME_TARGETS(scm-engine-0
GNC_ADD_SCHEME_TARGETS(scm-engine-1
"${engine_SCHEME_1}"
""
- ""
- ""
- ""
"scm-engine-0;${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index bd6bd45..10a6d62 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -219,17 +219,11 @@ GNC_ADD_SCHEME_TEST(scm-test-split test-split.scm)
SET(engine_test_SCHEME test-extras.scm)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS "")
SET(GUILE_DEPENDS scm-app-utils scm-scm)
GNC_ADD_SCHEME_TARGETS(scm-test-engine
"${engine_test_SCHEME}"
gnucash/engine/test
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/gnc-module/CMakeLists.txt b/libgnucash/gnc-module/CMakeLists.txt
index 4e441c9..250fd55 100644
--- a/libgnucash/gnc-module/CMakeLists.txt
+++ b/libgnucash/gnc-module/CMakeLists.txt
@@ -50,17 +50,11 @@ INSTALL(FILES ${gnc_module_HEADERS} DESTINATION include/gnucash)
SET (gnc_module_SCHEME gnc-module.scm)
SET(GUILE_OUTPUT_DIR gnucash)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS "")
-SET(GUILE_LIBRARY_DIRS "")
SET(GUILE_DEPENDS gnc-module)
GNC_ADD_SCHEME_TARGETS(scm-gnc-module
"${gnc_module_SCHEME}"
${GUILE_OUTPUT_DIR}
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
index 72f0d78..4d0aa5b 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -22,9 +22,6 @@ ENDIF()
# CONFIGURE_FILE(build-config.scm.in ${BUILD_CONFIG_SCM})
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module)
-SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module)
SET(GUILE_DEPENDS scm-core-utils scm-gnc-module)
SET(scm_SCHEME_0
@@ -35,16 +32,13 @@ SET(scm_SCHEME_0
xml-generator.scm
)
-GNC_ADD_SCHEME_TARGETS(scm-scm-0 "${scm_SCHEME_0}" "" "" "" "" "" FALSE)
+GNC_ADD_SCHEME_TARGETS(scm-scm-0 "${scm_SCHEME_0}" "" "" FALSE)
-GNC_ADD_SCHEME_TARGETS(scm-scm-1 "printf.scm" gnucash "" "" "" "" FALSE)
+GNC_ADD_SCHEME_TARGETS(scm-scm-1 "printf.scm" gnucash "" FALSE)
GNC_ADD_SCHEME_TARGETS(scm-scm-2
main.scm
gnucash
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-scm-1;${GUILE_DEPENDS}" # requires printf.scm from scm-scm-1 and modules from GUILE_DEPENDS
FALSE
)
@@ -53,9 +47,6 @@ GNC_ADD_SCHEME_TARGETS(scm-scm-2
GNC_ADD_SCHEME_TARGETS(scm-scm-3
price-quotes.scm
gnucash
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"scm-scm-2;scm-scm-0" # depends on build_config.scm
FALSE)
diff --git a/libgnucash/scm/gnumeric/CMakeLists.txt b/libgnucash/scm/gnumeric/CMakeLists.txt
index e262e9d..549761a 100644
--- a/libgnucash/scm/gnumeric/CMakeLists.txt
+++ b/libgnucash/scm/gnumeric/CMakeLists.txt
@@ -3,18 +3,10 @@
SET(gnumeric_SCHEME gnumeric-utilities.scm table-utils.scm)
-SET(GUILE_MODULES "")
-SET(GUILE_LOAD_DIRS "")
-SET(GUILE_LIBRARY_DIRS "")
-SET(GUILE_DEPENDS "")
-
GNC_ADD_SCHEME_TARGETS(scm-gnumeric
"${gnumeric_SCHEME}"
gnumeric
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
- "${GUILE_DEPENDS}"
+ ""
FALSE
)
diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt
index c99f1b8..83479bd 100644
--- a/libgnucash/tax/us/CMakeLists.txt
+++ b/libgnucash/tax/us/CMakeLists.txt
@@ -26,26 +26,17 @@ INSTALL(TARGETS gncmod-tax-us
SET(gncmod_tax_us_SCHEME_1 txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm)
SET(gncmod_tax_us_SCHEME_2 de_DE.scm us.scm)
-SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine)
-SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm)
-SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/gnc-module)
SET(GUILE_DEPENDS scm-app-utils)
GNC_ADD_SCHEME_TARGETS(scm-tax-us-1
"${gncmod_tax_us_SCHEME_1}"
""
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
GNC_ADD_SCHEME_TARGETS(scm-tax-us-2
"${gncmod_tax_us_SCHEME_2}"
gnucash/tax
- "${GUILE_MODULES}"
- "${GUILE_LOAD_DIRS}"
- "${GUILE_LIBRARY_DIRS}"
"${GUILE_DEPENDS}"
FALSE
)
Summary of changes:
common/cmake_modules/GncAddSchemeTargets.cmake | 13 +----
common/cmake_modules/MakeDistFiles.cmake | 14 -----
common/test-core/CMakeLists.txt | 6 --
configure.ac | 32 -----------
gnucash/gnome-utils/CMakeLists.txt | 9 ---
gnucash/gnome-utils/test/CMakeLists.txt | 19 +++++-
gnucash/gnome-utils/test/Makefile.am | 13 ++++-
...-module.in => test-load-gnome-utils-module.scm} | 4 --
gnucash/import-export/qif-imp/CMakeLists.txt | 9 ---
gnucash/register/register-core/test/Makefile.am | 2 -
gnucash/register/register-gnome/test/Makefile.am | 2 -
gnucash/report/business-reports/CMakeLists.txt | 11 +---
gnucash/report/locale-specific/us/CMakeLists.txt | 11 ----
.../report/locale-specific/us/test/CMakeLists.txt | 17 +++++-
...=> test-load-report-locale-specific-module.scm} | 5 --
gnucash/report/report-gnome/CMakeLists.txt | 6 --
gnucash/report/report-gnome/test/CMakeLists.txt | 18 ++++--
gnucash/report/report-gnome/test/Makefile.am | 13 ++++-
...module.in => test-load-report-gnome-module.scm} | 0
gnucash/report/report-system/CMakeLists.txt | 14 -----
gnucash/report/report-system/test/CMakeLists.txt | 20 +++----
gnucash/report/report-system/test/Makefile.am | 3 +-
...odule.in => test-load-report-system-module.scm} | 8 ---
gnucash/report/standard-reports/CMakeLists.txt | 9 ---
.../report/standard-reports/test/CMakeLists.txt | 22 +++++--
gnucash/report/standard-reports/test/Makefile.am | 4 ++
gnucash/report/stylesheets/CMakeLists.txt | 9 ---
gnucash/report/stylesheets/test/CMakeLists.txt | 26 +++++++--
gnucash/report/stylesheets/test/Makefile.am | 15 ++++-
....in => test-load-report-stylesheets-module.scm} | 12 +---
gnucash/report/utility-reports/CMakeLists.txt | 8 ---
libgnucash/app-utils/CMakeLists.txt | 15 -----
libgnucash/app-utils/test/CMakeLists.txt | 33 +++++++++--
libgnucash/app-utils/test/Makefile.am | 15 ++++-
...ad-module.in => test-load-app-utils-module.scm} | 4 --
libgnucash/core-utils/CMakeLists.txt | 6 --
libgnucash/engine/CMakeLists.txt | 9 ---
libgnucash/engine/test/CMakeLists.txt | 41 ++++++-------
libgnucash/engine/test/Makefile.am | 8 +--
libgnucash/engine/test/test-create-account.in | 2 -
libgnucash/engine/test/test-scm-query-import.in | 2 -
libgnucash/gnc-module/CMakeLists.txt | 8 +--
libgnucash/gnc-module/test/CMakeLists.txt | 67 +++++++++-------------
libgnucash/gnc-module/test/Makefile.am | 33 ++++++-----
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt | 7 +++
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt | 7 +++
...-load-deps.in => test-gnc-module-load-deps.scm} | 9 ---
...st-load-scm.in => test-gnc-module-load-scm.scm} | 8 +--
.../test/test-gnc-module-scm-dynload.scm | 5 ++
...st-scm-init.in => test-gnc-module-scm-init.scm} | 10 +---
...-load-scm.in => test-gnc-module-scm-module.scm} | 10 +---
...-scm-multi.in => test-gnc-module-scm-multi.scm} | 10 +---
...t-load-scm.in => test-gnc-module-swigged-c.scm} | 8 +--
libgnucash/gnc-module/test/test-gwrapped-c.in | 15 -----
libgnucash/gnc-module/test/test-scm-dynload.in | 15 -----
libgnucash/gnc-module/test/test-scm-module.in | 15 -----
libgnucash/scm/CMakeLists.txt | 13 +----
libgnucash/scm/gnumeric/CMakeLists.txt | 10 +---
libgnucash/tax/us/CMakeLists.txt | 9 ---
libgnucash/tax/us/test/CMakeLists.txt | 15 ++++-
...-load-module.in => test-load-tax-us-module.scm} | 4 --
po/POTFILES.skip | 1 +
62 files changed, 292 insertions(+), 476 deletions(-)
rename gnucash/gnome-utils/test/{test-load-module.in => test-load-gnome-utils-module.scm} (89%)
rename gnucash/report/locale-specific/us/test/{test-load-module.in => test-load-report-locale-specific-module.scm} (91%)
rename gnucash/report/report-gnome/test/{test-load-module.in => test-load-report-gnome-module.scm} (100%)
rename gnucash/report/report-system/test/{test-load-module.in => test-load-report-system-module.scm} (91%)
rename gnucash/report/stylesheets/test/{test-load-module.in => test-load-report-stylesheets-module.scm} (92%)
rename libgnucash/app-utils/test/{test-load-module.in => test-load-app-utils-module.scm} (97%)
delete mode 100755 libgnucash/engine/test/test-create-account.in
delete mode 100755 libgnucash/engine/test/test-scm-query-import.in
rename libgnucash/gnc-module/test/{test-load-deps.in => test-gnc-module-load-deps.scm} (81%)
copy libgnucash/gnc-module/test/{test-load-scm.in => test-gnc-module-load-scm.scm} (88%)
create mode 100755 libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
rename libgnucash/gnc-module/test/{test-scm-init.in => test-gnc-module-scm-init.scm} (79%)
copy libgnucash/gnc-module/test/{test-load-scm.in => test-gnc-module-scm-module.scm} (83%)
rename libgnucash/gnc-module/test/{test-scm-multi.in => test-gnc-module-scm-multi.scm} (86%)
rename libgnucash/gnc-module/test/{test-load-scm.in => test-gnc-module-swigged-c.scm} (88%)
delete mode 100755 libgnucash/gnc-module/test/test-gwrapped-c.in
delete mode 100755 libgnucash/gnc-module/test/test-scm-dynload.in
delete mode 100755 libgnucash/gnc-module/test/test-scm-module.in
rename libgnucash/tax/us/test/{test-load-module.in => test-load-tax-us-module.scm} (87%)
More information about the gnucash-changes
mailing list