Build or link all Scheme test files into a directory "tests".

Instead of random locations only occasionally related to the
corresponding source.

Includes renaming libgnucash/engine/test/test-extras.scm and
gnucash/report/report-system/test/test-extras.scm to avoid a
naming conflict.

common/test-core/CMakeLists.txt

@@ -55,7 +55,7 @@ endif()
 
 set(test_core_SCHEME unittest-support.scm)
 
-set(GUILE_OUTPUT_DIR   gnucash)
+set(GUILE_OUTPUT_DIR   tests)
 set(GUILE_DEPENDS      test-core-guile)
 
 

common/test-core/unittest-support.scm

@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash unittest-support))
+(define-module (tests unittest-support))
 (eval-when
       (compile load eval expand)
       (load-extension "libtest-core-guile" "scm_init_unittest_support_module"))

gnucash/gnome-utils/test/CMakeLists.txt

@@ -39,7 +39,7 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
   "test-load-gnome-utils-module.scm"
-  "gnucash/reports"
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
 )

gnucash/report/locale-specific/us/test/CMakeLists.txt

@@ -16,7 +16,7 @@ gnc_add_test(test-link-module-report-locale-specific-us test-link-module.c
 #
 #gnc_add_scheme_test_targets(test-load-report-locale-specific-module
 #  "test-load-report-locale-specific-module.scm"
-#  "gnucash/report"
+#  "tests"
 #  "${GUILE_DEPENDS}"
 #  FALSE
 #  )

gnucash/report/report-gnome/test/CMakeLists.txt

@@ -24,7 +24,7 @@ add_dependencies(test-link-module-report-gnome test-report-gnome)
 
 gnc_add_scheme_test_targets(scm-test-load-report-gnome-module
   "test-load-report-gnome-module.scm"
-  "gnucash/reports"
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
 )

gnucash/report/report-system/test/CMakeLists.txt

@@ -40,15 +40,15 @@ if (HAVE_SRFI64)
 endif (HAVE_SRFI64)
 
 gnc_add_scheme_test_targets(scm-test-report-system
-  "test-extras.scm"
+  "test-report-system-extras.scm"
-  gnucash/report/report-system/test
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
   )
 
 gnc_add_scheme_test_targets(scm-test-report-system-2
   "${scm_test_report_system_SOURCES}"
-  gnucash/report/report-system/test
+  "tests"
   "scm-test-report-system"
   FALSE
 )
@@ -58,6 +58,6 @@ set_dist_list(test_report_system_DIST
   CMakeLists.txt
   ${scm_test_report_system_with_srfi64_SOURCES}
   ${scm_test_report_system_SOURCES}
-  test-extras.scm
+  test-report-system-extras.scm
   test-link-module.c
 )

gnucash/report/report-system/test/test-commodity-utils.scm

@@ -23,8 +23,8 @@
 
 (use-modules (srfi srfi-64))
 (use-modules (ice-9 pretty-print))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))

gnucash/report/report-system/test/test-html-fonts.scm

@@ -1,5 +1,5 @@
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (load "../html-fonts.scm")
 
 (setlocale LC_ALL "C")

gnucash/report/report-system/test/test-html-utilities-srfi64.scm

@@ -3,10 +3,10 @@
 (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 (tests test-engine-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-64))
 
 (define (run-test)

gnucash/report/report-system/test/test-report-html.scm

@@ -2,10 +2,10 @@
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash report report-system))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 (define (run-test)
     (test-runner-factory gnc:test-runner)

gnucash/report/report-system/test/test-report-system-extras.scm

@@ -17,10 +17,10 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report report-system test test-extras))
+(define-module (tests test-report-system-extras))
 
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash report report-system))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))

gnucash/report/report-system/test/test-report-system.scm

@@ -2,10 +2,10 @@
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash report report-system))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

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

@@ -4,9 +4,9 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report report-system))
 
 (setlocale LC_ALL "C")

gnucash/report/report-system/test/test-test-extras.scm

@@ -17,8 +17,8 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 

gnucash/report/reports/standard/test/CMakeLists.txt

@@ -44,7 +44,7 @@ gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
 
 gnc_add_scheme_test_targets(scm-test-reports-standard
   "${scm_test_reports_standard_SOURCES}"
-  gnucash/report/reports/standard/test
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
 )

gnucash/report/reports/standard/test/test-average-balance.scm

@@ -1,13 +1,13 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard average-balance))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report reports standard budget))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash engine))

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -1,13 +1,13 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard balance-sheet))
 (use-modules (gnucash report reports standard income-statement))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 

gnucash/report/reports/standard/test/test-budget.scm

@@ -21,7 +21,7 @@
 (use-modules (srfi srfi-14))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 
@@ -31,9 +31,9 @@
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard budget))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")

gnucash/report/reports/standard/test/test-cash-flow.scm

@@ -2,7 +2,7 @@
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard cash-flow))
 (use-modules (gnucash report report-system))
 

gnucash/report/reports/standard/test/test-cashflow-barchart.scm

@@ -24,10 +24,10 @@
 
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (srfi srfi-1))

gnucash/report/reports/standard/test/test-charts.scm

@@ -1,6 +1,6 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard category-barchart))
 (use-modules (gnucash report reports standard net-charts))
 (use-modules (gnucash report reports standard account-piecharts))
@@ -9,9 +9,9 @@
 (use-modules (gnucash report reports standard price-scatter))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 (use-modules (system vm coverage))

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -1,12 +1,12 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 

gnucash/report/reports/standard/test/test-invoice.scm

@@ -1,13 +1,13 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard invoice))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 (use-modules (system vm coverage))

gnucash/report/reports/standard/test/test-register.scm

@@ -21,7 +21,7 @@
 (use-modules (srfi srfi-14))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 ;; Guile 2 needs to load external modules at compile time
 ;; otherwise the N_ syntax-rule won't be found at compile time
@@ -36,9 +36,9 @@
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard register))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")

gnucash/report/reports/standard/test/test-standard-category-report.scm

@@ -21,7 +21,7 @@
 (use-modules (srfi srfi-14))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 ;; Guile 2 needs to load external modules at compile time
 ;; otherwise the N_ syntax-rule won't be found at compile time
@@ -36,11 +36,10 @@
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard net-charts))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report reports standard category-barchart))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
-(use-modules (gnucash report report-system test test-extras))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")

gnucash/report/reports/standard/test/test-standard-net-barchart.scm

@@ -24,9 +24,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable

gnucash/report/reports/standard/test/test-standard-net-linechart.scm

@@ -24,9 +24,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable

gnucash/report/reports/standard/test/test-stress-options.scm

@@ -3,16 +3,16 @@
 (use-modules (gnucash utilities))
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports))
 (use-modules (gnucash report reports sample view-column))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report reports standard taxinvoice))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-64))
 (use-modules (srfi srfi-98))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 

gnucash/report/reports/standard/test/test-transaction.scm

@@ -1,13 +1,13 @@
 (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 (tests test-engine-extras))
 (use-modules (gnucash report reports standard transaction))
 (use-modules (gnucash report reports standard reconcile-report))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 (use-modules (system vm coverage))

gnucash/report/stylesheets/test/CMakeLists.txt

@@ -15,7 +15,7 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_test_targets(scm-test-load-report-stylesheets-module
   "test-load-report-stylesheets-module.scm"
-  "gnucash/report"
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
   )

gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm

@@ -1,6 +1,6 @@
 (setenv "GNC_UNINSTALLED" "1")
 (display "  testing stylesheet module load ... ")
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.report.core")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-CRITICAL))

libgnucash/app-utils/test/CMakeLists.txt

@@ -51,14 +51,14 @@ set (test_app_utils_scheme_SRFI64_SOURCES
 
 gnc_add_scheme_test_targets(scm-test-load-app-utils-module
   "test-load-app-utils-module.scm"
-  "gnucash/reports"
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
 gnc_add_scheme_test_targets(scm-test-c-interface
   "test-c-interface.scm"
-  ""
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
 )

libgnucash/app-utils/test/test-c-interface.scm

@@ -20,7 +20,7 @@
 (setenv "GNC_UNINSTALLED" "1")
 (debug-set! stack 50000)
 (load-from-path "c-interface")
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 
 (define (test-func a b)
     (list (/ a b) 6))

libgnucash/app-utils/test/test-date-utilities.scm

@@ -1,8 +1,8 @@
 (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 (tests test-engine-extras))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

libgnucash/engine/test/CMakeLists.txt

@@ -229,8 +229,8 @@ set(engine_test_SCHEME
 set(GUILE_DEPENDS      scm-gnc-module scm-app-utils scm-scm scm-engine)
 
 gnc_add_scheme_test_targets(scm-test-engine-extras
-  "test-extras.scm"
+  "test-engine-extras.scm"
-  "gnucash/engine/test/"
+  "tests"
   "${GUILE_DEPENDS}"
   FALSE
   )
@@ -238,7 +238,7 @@ gnc_add_scheme_test_targets(scm-test-engine-extras
 if (HAVE_SRFI64)
   gnc_add_scheme_test_targets (scm-srfi64-extras
     "srfi64-extras.scm"
-    "gnucash/engine/test/"
+    "tests"
     "${GUILE_DEPENDS}"
     FALSE
     )
@@ -251,7 +251,7 @@ endif (HAVE_SRFI64)
 
 gnc_add_scheme_test_targets(scm-test-engine
   "${engine_test_SCHEME}"
-  ""
+  "tests"
   "${GUILE_DEPENDS};scm-test-engine-extras"
   FALSE
   )
@@ -315,7 +315,7 @@ set(test_engine_SOURCES_DIST
 set(test_engine_SCHEME_DIST
         test-account.scm
         test-create-account.scm
-        test-extras.scm
+        test-engine-extras.scm
         test-scm-query-import.scm
         test-split.scm
 )

libgnucash/engine/test/srfi64-extras.scm

@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash engine test srfi64-extras))
+(define-module (tests srfi64-extras))
 (use-modules (srfi srfi-64))
 
 (export gnc:test-runner)

libgnucash/engine/test/test-account.scm

@@ -4,7 +4,7 @@
 
 (use-modules (gnucash engine))
 
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
 
 ;; this test suite tests deprecated functions.
 

libgnucash/engine/test/test-engine-extras.scm

@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash engine test test-extras))
+(define-module (tests test-engine-extras))
 
 (use-modules (gnucash gnc-module))
 

libgnucash/engine/test/test-split.scm

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

libgnucash/gnc-module/test/CMakeLists.txt

@@ -68,7 +68,7 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_test_targets(test-gnc-modules-scm
   "${test_gnc_module_SCHEME}"
-  "gnucash/gnc-modules/test"
+  "tests"
   "${GUILE_DEPENDS}"
   TRUE
   )

libgnucash/gnc-module/test/mod-baz/CMakeLists.txt

@@ -27,7 +27,7 @@ target_include_directories(gncmod-baz PRIVATE
 
 gnc_add_scheme_test_targets(scm-mod-baz
   gnucash/baz.scm
-  "gnucash"
+  "tests"
   gncmod-baz
   TRUE
   )

libgnucash/gnc-module/test/mod-foo/CMakeLists.txt

@@ -21,7 +21,7 @@ target_include_directories(gncmod-foo PRIVATE
 
 gnc_add_scheme_test_targets(scm-mod-foo
   gnucash/foo.scm
-  "gnucash"
+  "tests"
   gncmod-foo
   TRUE
   )

libgnucash/gnc-module/test/test-gnc-module-load-deps.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/gnc-module/test/test-gnc-module-load-scm.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/gnc-module/test/test-gnc-module-scm-init.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/gnc-module/test/test-gnc-module-scm-module.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm

@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
 (define log-domain "gnc.module")
 (define check (new-TestErrorStruct))
 (define log-level (G-LOG-LEVEL-WARNING))

libgnucash/scm/test/CMakeLists.txt

@@ -12,7 +12,7 @@ set(GUILE_DEPENDS
 if (HAVE_SRFI64)
   gnc_add_scheme_test_targets(scm-test-scm
     "${scm_test_SCHEME}"
-    ""
+    "tests"
     "${GUILE_DEPENDS}"
     FALSE
     )

libgnucash/scm/test/test-libgnucash-scm-utilities.scm

@@ -2,7 +2,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash utilities))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

libgnucash/tax/us/test/CMakeLists.txt

@@ -13,7 +13,7 @@ gnc_add_test(test-link-module-tax-us test-link-module.c
 #
 #gnc_add_scheme_test_targets(scm-test-load-tax-us-module
 #  "test-load-tax-us-module.scm"
-#  "gnucash/reports"
+#  "tests"
 #  "${GUILE_DEPENDS}"
 #  FALSE
 #)