Some fixes to the previous commit so that it works on both guile-1.8 and 2.0

src/engine/test/Makefile.am

@@ -63,6 +63,7 @@ SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)
 GNC_TEST_DEPS = \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/engine/test \
+  --gnc-module-dir ${top_builddir}/src/app-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/app-utils \

src/engine/test/test-account.scm

@@ -1,7 +1,10 @@
+(use-modules (gnucash gnc-module))
+
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+
 (use-modules (gnucash engine))
 
 (use-modules (gnucash engine test test-extras))
-(use-modules (sw_engine))
 
 (define (run-test)
   (test test-account-same?)

src/engine/test/test-split.scm

@@ -4,7 +4,6 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
 (use-modules (gnucash engine))
-(use-modules (sw_engine))
 (use-modules (gnucash engine test test-extras))
 (use-modules (gnucash app-utils))
 

src/engine/test/test-test-extras.scm

@@ -18,6 +18,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (debug-set! stack 50000)
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
 (use-modules (ice-9 streams))
 (use-modules (gnucash engine))

src/report/report-system/test/Makefile.am

@@ -21,7 +21,6 @@ TESTS = \
 SCM_TESTS = \
 	test-collectors \
 	test-list-extras \
-	test-test-extras \
 	test-report-utilities
 
 SCM_TEST_SRCS = $(SCM_TESTS:%=%.scm)

src/report/report-system/test/test-collectors.scm

@@ -18,6 +18,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (debug-set! stack 50000)
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (srfi srfi-1))
 
 (use-modules (gnucash report report-system collectors))

src/report/report-system/test/test-list-extras.scm

@@ -18,6 +18,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (debug-set! stack 50000)
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash report report-system list-extras))
 (use-modules (gnucash engine test test-extras))
 

src/report/report-system/test/test-report-utilities.scm

@@ -1,6 +1,8 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+
 
 (use-modules (gnucash engine test test-extras))
 (use-modules (gnucash report report-system test test-extras))