From cac307602fa5c7880fbecc031b3d5f8a4e4a6547 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 17 May 2019 16:10:49 -0700 Subject: [PATCH] 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 | 2 +- common/test-core/unittest-support.scm | 2 +- gnucash/gnome-utils/test/CMakeLists.txt | 2 +- gnucash/report/locale-specific/us/test/CMakeLists.txt | 2 +- gnucash/report/report-gnome/test/CMakeLists.txt | 2 +- gnucash/report/report-system/test/CMakeLists.txt | 8 ++++---- .../report/report-system/test/test-commodity-utils.scm | 4 ++-- gnucash/report/report-system/test/test-html-fonts.scm | 2 +- .../report-system/test/test-html-utilities-srfi64.scm | 6 +++--- gnucash/report/report-system/test/test-report-html.scm | 4 ++-- .../{test-extras.scm => test-report-system-extras.scm} | 4 ++-- .../report/report-system/test/test-report-system.scm | 4 ++-- .../report-system/test/test-report-utilities.scm | 6 +++--- gnucash/report/report-system/test/test-test-extras.scm | 4 ++-- gnucash/report/reports/standard/test/CMakeLists.txt | 2 +- .../reports/standard/test/test-average-balance.scm | 6 +++--- .../report/reports/standard/test/test-balsheet-pnl.scm | 6 +++--- gnucash/report/reports/standard/test/test-budget.scm | 6 +++--- .../report/reports/standard/test/test-cash-flow.scm | 2 +- .../reports/standard/test/test-cashflow-barchart.scm | 6 +++--- gnucash/report/reports/standard/test/test-charts.scm | 6 +++--- .../report/reports/standard/test/test-income-gst.scm | 6 +++--- gnucash/report/reports/standard/test/test-invoice.scm | 6 +++--- gnucash/report/reports/standard/test/test-register.scm | 6 +++--- .../standard/test/test-standard-category-report.scm | 7 +++---- .../standard/test/test-standard-net-barchart.scm | 6 +++--- .../standard/test/test-standard-net-linechart.scm | 6 +++--- .../reports/standard/test/test-stress-options.scm | 6 +++--- .../report/reports/standard/test/test-transaction.scm | 6 +++--- gnucash/report/stylesheets/test/CMakeLists.txt | 2 +- .../test/test-load-report-stylesheets-module.scm | 2 +- libgnucash/app-utils/test/CMakeLists.txt | 4 ++-- libgnucash/app-utils/test/test-c-interface.scm | 2 +- libgnucash/app-utils/test/test-date-utilities.scm | 4 ++-- libgnucash/engine/test/CMakeLists.txt | 10 +++++----- libgnucash/engine/test/srfi64-extras.scm | 2 +- libgnucash/engine/test/test-account.scm | 2 +- .../test/{test-extras.scm => test-engine-extras.scm} | 2 +- libgnucash/engine/test/test-split.scm | 2 +- libgnucash/gnc-module/test/CMakeLists.txt | 2 +- libgnucash/gnc-module/test/mod-baz/CMakeLists.txt | 2 +- libgnucash/gnc-module/test/mod-foo/CMakeLists.txt | 2 +- .../gnc-module/test/test-gnc-module-load-deps.scm | 2 +- .../gnc-module/test/test-gnc-module-load-scm.scm | 2 +- .../gnc-module/test/test-gnc-module-scm-init.scm | 2 +- .../gnc-module/test/test-gnc-module-scm-module.scm | 2 +- .../gnc-module/test/test-gnc-module-scm-multi.scm | 2 +- .../gnc-module/test/test-gnc-module-swigged-c.scm | 2 +- libgnucash/scm/test/CMakeLists.txt | 2 +- libgnucash/scm/test/test-libgnucash-scm-utilities.scm | 2 +- libgnucash/tax/us/test/CMakeLists.txt | 2 +- 51 files changed, 95 insertions(+), 96 deletions(-) rename gnucash/report/report-system/test/{test-extras.scm => test-report-system-extras.scm} (97%) rename libgnucash/engine/test/{test-extras.scm => test-engine-extras.scm} (99%) diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt index 9bf12478b8..afb7f0ec0c 100644 --- a/common/test-core/CMakeLists.txt +++ b/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) diff --git a/common/test-core/unittest-support.scm b/common/test-core/unittest-support.scm index 05254719e7..cef067e19b 100644 --- a/common/test-core/unittest-support.scm +++ b/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")) diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt index 3c7f03d224..fbb26769d7 100644 --- a/gnucash/gnome-utils/test/CMakeLists.txt +++ b/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 ) diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt index c227abd924..70ec0e0e00 100644 --- a/gnucash/report/locale-specific/us/test/CMakeLists.txt +++ b/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 # ) diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt index 171e8d5e86..e35e71604b 100644 --- a/gnucash/report/report-gnome/test/CMakeLists.txt +++ b/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 ) diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt index 01b807b2a6..4c34e222ba 100644 --- a/gnucash/report/report-system/test/CMakeLists.txt +++ b/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" - gnucash/report/report-system/test + "test-report-system-extras.scm" + "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 ) diff --git a/gnucash/report/report-system/test/test-commodity-utils.scm b/gnucash/report/report-system/test/test-commodity-utils.scm index 97d104d054..b360cc12a7 100644 --- a/gnucash/report/report-system/test/test-commodity-utils.scm +++ b/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 (gnucash engine test test-extras)) +(use-modules (tests srfi64-extras)) +(use-modules (tests test-engine-extras)) (use-modules (gnucash app-utils)) (use-modules (gnucash engine)) (use-modules (sw_engine)) diff --git a/gnucash/report/report-system/test/test-html-fonts.scm b/gnucash/report/report-system/test/test-html-fonts.scm index fecc058b4e..bdb4d9099e 100644 --- a/gnucash/report/report-system/test/test-html-fonts.scm +++ b/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") diff --git a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm b/gnucash/report/report-system/test/test-html-utilities-srfi64.scm index ef712c7acb..163909aeaa 100644 --- a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm +++ b/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 (gnucash report report-system test test-extras)) +(use-modules (tests test-engine-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) diff --git a/gnucash/report/report-system/test/test-report-html.scm b/gnucash/report/report-system/test/test-report-html.scm index 966a63da39..196aac491c 100644 --- a/gnucash/report/report-system/test/test-report-html.scm +++ b/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) diff --git a/gnucash/report/report-system/test/test-extras.scm b/gnucash/report/report-system/test/test-report-system-extras.scm similarity index 97% rename from gnucash/report/report-system/test/test-extras.scm rename to gnucash/report/report-system/test/test-report-system-extras.scm index 9f546700d1..bbeef1d5b8 100644 --- a/gnucash/report/report-system/test/test-extras.scm +++ b/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)) diff --git a/gnucash/report/report-system/test/test-report-system.scm b/gnucash/report/report-system/test/test-report-system.scm index a683e375f3..ffdf326229 100644 --- a/gnucash/report/report-system/test/test-report-system.scm +++ b/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) diff --git a/gnucash/report/report-system/test/test-report-utilities.scm b/gnucash/report/report-system/test/test-report-utilities.scm index f58878fb15..9f64f4cbcc 100644 --- a/gnucash/report/report-system/test/test-report-utilities.scm +++ b/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 (gnucash engine test test-extras)) -(use-modules (gnucash report report-system test test-extras)) +(use-modules (tests srfi64-extras)) +(use-modules (tests test-engine-extras)) +(use-modules (tests test-report-system-extras)) (use-modules (gnucash report report-system)) (setlocale LC_ALL "C") diff --git a/gnucash/report/report-system/test/test-test-extras.scm b/gnucash/report/report-system/test/test-test-extras.scm index 8787e617fb..bd03b2af36 100644 --- a/gnucash/report/report-system/test/test-test-extras.scm +++ b/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 (gnucash engine test test-extras)) +(use-modules (tests test-report-system-extras)) +(use-modules (tests test-engine-extras)) (use-modules (gnucash engine)) (use-modules (sw_engine)) diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt index d625a15e1f..36e899751f 100644 --- a/gnucash/report/reports/standard/test/CMakeLists.txt +++ b/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 ) diff --git a/gnucash/report/reports/standard/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm index 72d631fd22..39dad0beb7 100644 --- a/gnucash/report/reports/standard/test/test-average-balance.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm index 07fdede9f4..bee5475865 100644 --- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm index 33f44e690b..4c91db90b2 100644 --- a/gnucash/report/reports/standard/test/test-budget.scm +++ b/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") diff --git a/gnucash/report/reports/standard/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm index e405072708..db62bfc96e 100644 --- a/gnucash/report/reports/standard/test/test-cash-flow.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm index 05acb66faa..3eadcf8845 100644 --- a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm +++ b/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 (gnucash engine test srfi64-extras)) +(use-modules (tests test-engine-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)) diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm index d49fb011ce..8adf6aa2e7 100644 --- a/gnucash/report/reports/standard/test/test-charts.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-income-gst.scm b/gnucash/report/reports/standard/test/test-income-gst.scm index 77ffacaa38..7634516672 100644 --- a/gnucash/report/reports/standard/test/test-income-gst.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm index 04ae97c19a..9e122d2fb6 100644 --- a/gnucash/report/reports/standard/test/test-invoice.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm index aebe5c0ca5..3b9e1118fa 100644 --- a/gnucash/report/reports/standard/test/test-register.scm +++ b/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") diff --git a/gnucash/report/reports/standard/test/test-standard-category-report.scm b/gnucash/report/reports/standard/test/test-standard-category-report.scm index cdfac0282c..7531436fd3 100644 --- a/gnucash/report/reports/standard/test/test-standard-category-report.scm +++ b/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 (gnucash report report-system test test-extras)) +(use-modules (tests test-engine-extras)) ;; Explicitly set locale to make the report output predictable (setlocale LC_ALL "C") diff --git a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm index 9623122d32..b1721dc82d 100644 --- a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm +++ b/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 (gnucash engine test srfi64-extras)) -(use-modules (gnucash report report-system test test-extras)) +(use-modules (tests test-engine-extras)) +(use-modules (tests srfi64-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 diff --git a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm index f998bfe7fd..01f16132c3 100644 --- a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm +++ b/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 (gnucash engine test srfi64-extras)) -(use-modules (gnucash report report-system test test-extras)) +(use-modules (tests test-engine-extras)) +(use-modules (tests srfi64-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 diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm index e4eb69cb58..c785221123 100644 --- a/gnucash/report/reports/standard/test/test-stress-options.scm +++ b/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)) diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm index 3e1a5c13a7..92f9d07351 100644 --- a/gnucash/report/reports/standard/test/test-transaction.scm +++ b/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)) diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt index 8a16f8e44e..30eb540dad 100644 --- a/gnucash/report/stylesheets/test/CMakeLists.txt +++ b/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 ) diff --git a/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm b/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm index 2217dba81b..570d8648f6 100755 --- a/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm +++ b/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)) diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt index 73f1071c42..de20eecb83 100644 --- a/libgnucash/app-utils/test/CMakeLists.txt +++ b/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 ) diff --git a/libgnucash/app-utils/test/test-c-interface.scm b/libgnucash/app-utils/test/test-c-interface.scm index f12cb1cd92..fe2445cd47 100644 --- a/libgnucash/app-utils/test/test-c-interface.scm +++ b/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)) diff --git a/libgnucash/app-utils/test/test-date-utilities.scm b/libgnucash/app-utils/test/test-date-utilities.scm index a495d9c75a..1ed664a15f 100644 --- a/libgnucash/app-utils/test/test-date-utilities.scm +++ b/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) diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt index 3f7ce677b9..60c1f93fa9 100644 --- a/libgnucash/engine/test/CMakeLists.txt +++ b/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" - "gnucash/engine/test/" + "test-engine-extras.scm" + "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 ) diff --git a/libgnucash/engine/test/srfi64-extras.scm b/libgnucash/engine/test/srfi64-extras.scm index 81329b219f..b41baee432 100644 --- a/libgnucash/engine/test/srfi64-extras.scm +++ b/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) diff --git a/libgnucash/engine/test/test-account.scm b/libgnucash/engine/test/test-account.scm index e2ad2c4544..81b36cf865 100644 --- a/libgnucash/engine/test/test-account.scm +++ b/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. diff --git a/libgnucash/engine/test/test-extras.scm b/libgnucash/engine/test/test-engine-extras.scm similarity index 99% rename from libgnucash/engine/test/test-extras.scm rename to libgnucash/engine/test/test-engine-extras.scm index 6d53edd772..b2ec3e25dc 100644 --- a/libgnucash/engine/test/test-extras.scm +++ b/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)) diff --git a/libgnucash/engine/test/test-split.scm b/libgnucash/engine/test/test-split.scm index e5f53a6ef0..dd10dcb36b 100644 --- a/libgnucash/engine/test/test-split.scm +++ b/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) diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt index 65ea8b1492..ae87b460d0 100644 --- a/libgnucash/gnc-module/test/CMakeLists.txt +++ b/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 ) diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt index 23caa15d5b..23b2dfad7b 100644 --- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt +++ b/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 ) diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt index c18f06ef51..5e05b1092e 100644 --- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt +++ b/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 ) diff --git a/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm b/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm index d88791f23a..c8f570382f 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm +++ b/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)) diff --git a/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm b/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm index d67fb19dbe..46a8385b21 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm +++ b/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)) diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm index c18f994f49..b66bdbcb7e 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm +++ b/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)) diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm index ccfd804c63..689bb7c2c3 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm +++ b/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)) diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm index bc938f285d..126c444092 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm +++ b/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)) diff --git a/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm b/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm index 913b49f242..89c5216daa 100755 --- a/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm +++ b/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)) diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt index 97f1129db5..05105a25da 100644 --- a/libgnucash/scm/test/CMakeLists.txt +++ b/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 ) diff --git a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm index b5db94b246..cd445837d6 100644 --- a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm +++ b/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) diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt index a324c18b82..e8460be5bb 100644 --- a/libgnucash/tax/us/test/CMakeLists.txt +++ b/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 #)