From 5a381125ae556dd9c4e4bc2f3a673791854b0ab8 Mon Sep 17 00:00:00 2001
From: Peter Broadbery <p.broadbery@gmail.com>
Date: Sun, 15 Nov 2015 17:16:56 +0000
Subject: [PATCH] Some fixes to the previous commit so that it works on both
 guile-1.8 and 2.0

---
 src/engine/test/Makefile.am                             | 1 +
 src/engine/test/test-account.scm                        | 5 ++++-
 src/engine/test/test-split.scm                          | 1 -
 src/engine/test/test-test-extras.scm                    | 2 ++
 src/report/report-system/test/Makefile.am               | 1 -
 src/report/report-system/test/test-collectors.scm       | 2 ++
 src/report/report-system/test/test-list-extras.scm      | 2 ++
 src/report/report-system/test/test-report-utilities.scm | 2 ++
 8 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index 56e3adeac1..5e29c7f775 100644
--- a/src/engine/test/Makefile.am
+++ b/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 \
diff --git a/src/engine/test/test-account.scm b/src/engine/test/test-account.scm
index 8b90395165..e76aaffad0 100644
--- a/src/engine/test/test-account.scm
+++ b/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?)
diff --git a/src/engine/test/test-split.scm b/src/engine/test/test-split.scm
index d45f0773f6..96dab5e997 100644
--- a/src/engine/test/test-split.scm
+++ b/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))
 
diff --git a/src/engine/test/test-test-extras.scm b/src/engine/test/test-test-extras.scm
index 241b2474ad..e735daea33 100644
--- a/src/engine/test/test-test-extras.scm
+++ b/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))
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index d1ed938fed..4b9e126f06 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/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)
diff --git a/src/report/report-system/test/test-collectors.scm b/src/report/report-system/test/test-collectors.scm
index 82cbd388d8..40651bebd6 100644
--- a/src/report/report-system/test/test-collectors.scm
+++ b/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))
diff --git a/src/report/report-system/test/test-list-extras.scm b/src/report/report-system/test/test-list-extras.scm
index 1855883979..46f04b5e49 100644
--- a/src/report/report-system/test/test-list-extras.scm
+++ b/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))
 
diff --git a/src/report/report-system/test/test-report-utilities.scm b/src/report/report-system/test/test-report-utilities.scm
index 24d5d7ef0c..d130e45448 100644
--- a/src/report/report-system/test/test-report-utilities.scm
+++ b/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))