Modifications to consider module changes in master

gnucash/import-export/qif-imp/test/CMakeLists.txt

@@ -9,11 +9,26 @@ set(scm_qifimp_test_with_srfi64_SOURCES
   test-qif-merge-groups.scm
   )
 
-
+set (GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-engine
+  scm-test-engine
+  scm-gettext
+  scm-scm
+  scm-qif-import
+)
 gnc_add_test(test-link-qif-imp test-link.c QIF_IMP_TEST_INCLUDE_DIRS QIF_IMP_TEST_LIBS)
 
 if (HAVE_SRFI64)
   gnc_add_scheme_tests("${scm_qifimp_test_with_srfi64_SOURCES}")
+
+  gnc_add_scheme_test_targets(scm-test-qif-imp-srfi64
+    "${scm_qifimp_test_with_srfi64_SOURCES}"
+    "tests"
+    "${GUILE_DEPENDS};scm-srfi64-extras"
+    FALSE
+    )
 endif (HAVE_SRFI64)
 
 set_dist_list(test_qif_import_DIST CMakeLists.txt test-link.c

gnucash/import-export/qif-imp/test/test-qif-imp.scm

@@ -1,9 +1,9 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash import-export qif-import))
-(use-modules (gnucash import-export string))
+(use-modules (tests srfi64-extras))
+(use-modules (gnucash qif-import))
+(use-modules (gnucash string))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm

@@ -1,11 +1,10 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash import-export qif-import))
-(use-modules (gnucash import-export string))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report report-system))
+(use-modules (tests srfi64-extras))
+(use-modules (gnucash qif-import))
+(use-modules (gnucash string))
+(use-modules (tests test-engine-extras))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
@@ -23,7 +22,7 @@
 
 (define (test-gnc:account-tree-get-transactions)
   (define gnc:account-tree-get-transactions
-    (@@ (gnucash import-export qif-import) gnc:account-tree-get-transactions))
+    (@@ (gnucash qif-import) gnc:account-tree-get-transactions))
 
   (test-group-with-cleanup "test-gnc:account-tree-get-transactions"
     (create-test-data)
@@ -37,7 +36,7 @@
 
 (define (test-gnc:account-tree-find-duplicates)
   (define gnc:account-tree-find-duplicates
-    (@@ (gnucash import-export qif-import) gnc:account-tree-find-duplicates))
+    (@@ (gnucash qif-import) gnc:account-tree-find-duplicates))
   (define new-structure
     (list "Root" (list (cons 'type ACCT-TYPE-ASSET))
           (list "Asset"

gnucash/import-export/qif-imp/test/test-qif-parse.scm

@@ -1,9 +1,9 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash import-export qif-import))
-(use-modules (gnucash import-export string))
+(use-modules (tests srfi64-extras))
+(use-modules (gnucash qif-import))
+(use-modules (gnucash string))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
@@ -28,27 +28,27 @@
 
 ;; the following isn't exported but can be tested anyway!
 (define qif-parse:fix-year
-  (@@ (gnucash import-export qif-import) qif-parse:fix-year))
+  (@@ (gnucash qif-import) qif-parse:fix-year))
 (define qif-parse:parse-acct-type
-  (@@ (gnucash import-export qif-import) qif-parse:parse-acct-type))
+  (@@ (gnucash qif-import) qif-parse:parse-acct-type))
 (define qif-parse:parse-cleared-field
-  (@@ (gnucash import-export qif-import) qif-parse:parse-cleared-field))
+  (@@ (gnucash qif-import) qif-parse:parse-cleared-field))
 (define qif-split:parse-category
-  (@@ (gnucash import-export qif-import) qif-split:parse-category))
+  (@@ (gnucash qif-import) qif-split:parse-category))
 (define qif-parse:parse-action-field
-  (@@ (gnucash import-export qif-import) qif-parse:parse-action-field))
+  (@@ (gnucash qif-import) qif-parse:parse-action-field))
 (define qif-parse:check-date-format
-  (@@ (gnucash import-export qif-import) qif-parse:check-date-format))
+  (@@ (gnucash qif-import) qif-parse:check-date-format))
 (define qif-parse:parse-date/format
-  (@@ (gnucash import-export qif-import) qif-parse:parse-date/format))
+  (@@ (gnucash qif-import) qif-parse:parse-date/format))
 (define qif-parse:check-number-format
-  (@@ (gnucash import-export qif-import) qif-parse:check-number-format))
+  (@@ (gnucash qif-import) qif-parse:check-number-format))
 (define qif-parse:parse-number/format
-  (@@ (gnucash import-export qif-import) qif-parse:parse-number/format))
+  (@@ (gnucash qif-import) qif-parse:parse-number/format))
 (define qif-parse:check-number-formats
-  (@@ (gnucash import-export qif-import) qif-parse:check-number-formats))
+  (@@ (gnucash qif-import) qif-parse:check-number-formats))
 (define qif-parse:parse-numbers/format
-  (@@ (gnucash import-export qif-import) qif-parse:parse-numbers/format))
+  (@@ (gnucash qif-import) qif-parse:parse-numbers/format))
 
 
 (define (test-qif-parse:fix-year)

gnucash/report/eguile-html-utilities.scm

@@ -30,7 +30,6 @@
 (gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/app-utils" 0)
 
-(use-modules (gnucash report eguile-gnc))
 (use-modules (ice-9 regex))  ; for regular expressions
 (use-modules (srfi srfi-13)) ; for extra string functions
 

libgnucash/app-utils/test/CMakeLists.txt

@@ -91,6 +91,7 @@ set_dist_list(test_app_utils_DIST
   test-sx.cpp
   test-c-interface.scm
   test-date-utilities.scm
+  test-options.scm
   ${test_app_utils_scheme_SOURCES}
   ${test_app_utils_SOURCES}
 )

libgnucash/app-utils/test/test-options.scm

@@ -1,7 +1,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (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)