gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a12bbacc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/92a920c4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/84cc7b1b (commit)
	from  https://github.com/Gnucash/gnucash/commit/268dbbe3 (commit)



commit a12bbaccd363756a8a0c708ac5194ed679567e2f
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 23 16:38:37 2019 -0700

    Create CMakeLists.txt in libgnucash/scm/test.
    
    Amended by chris to add a working scm/test/CMakeLists.txt.

diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
index 021ab99cd..731e44a33 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(test)
+
 set(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
 
 
@@ -17,6 +19,6 @@ gnc_add_scheme_targets(price-quotes
 
 
 set_local_dist(scm_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
-set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)
+set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} ${test_scm_DIST} PARENT_SCOPE)
 
 
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
new file mode 100644
index 000000000..2e7a880c4
--- /dev/null
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -0,0 +1,29 @@
+set(scm_test_SCHEME
+  test-libgnucash-scm-utilities.scm
+  )
+
+set(GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-scm scm-engine
+  )
+
+if (HAVE_SRFI64)
+  gnc_add_scheme_targets(scm-test-scm
+    "${scm_test_SCHEME}"
+    ""
+    "${GUILE_DEPENDS}"
+    FALSE
+    )
+
+  set(srfi64_extras_SCHEME_DIST
+    srfi64-extras.scm
+    )
+  gnc_add_scheme_tests("${scm_test_SCHEME}")
+
+endif (HAVE_SRFI64)
+
+set_dist_list(test_scm_DIST
+  CMakeLists.txt
+  ${scm_test_SCHEME}
+  )

commit 92a920c4e0a6d503357d317e6ea8faa197075e20
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Apr 24 22:42:40 2019 +0800

    [test-libgnucash-scm-utilities] renamed from test-utilities.scm

diff --git a/libgnucash/scm/test/test-utilities.scm b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
similarity index 95%
rename from libgnucash/scm/test/test-utilities.scm
rename to libgnucash/scm/test/test-libgnucash-scm-utilities.scm
index 8ee2f5975..cd426c5db 100644
--- a/libgnucash/scm/test/test-utilities.scm
+++ b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
@@ -6,10 +6,10 @@
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
-  (test-begin "test-utilities.scm")
+  (test-begin "test-libgnucash-scm-utilities.scm")
   (test-traverse-vec)
   (test-substring-replace)
-  (test-begin "test-utilities.scm"))
+  (test-begin "test-libgnucash-scm-utilities.scm"))
 
 (define (test-traverse-vec)
   (test-begin "traverse-vec")

commit 84cc7b1bff104977f03e7430a34e587dc3563847
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Apr 24 22:26:17 2019 +0800

    [guile-json] fix CMakeLists.txt
    
    one file was renamed during the guile-json update.

diff --git a/borrowed/guile-json/CMakeLists.txt b/borrowed/guile-json/CMakeLists.txt
index e3fba175b..b7f4f9f80 100644
--- a/borrowed/guile-json/CMakeLists.txt
+++ b/borrowed/guile-json/CMakeLists.txt
@@ -10,7 +10,7 @@ gnc_add_scheme_targets (guile-json
 set_local_dist(guile-json_DIST_LOCAL
   AUTHORS
   CMakeLists.txt
-  COPYING.LESSER
+  COPYING
   json.scm
   NEWS
   README



Summary of changes:
 borrowed/guile-json/CMakeLists.txt                 |  2 +-
 libgnucash/scm/CMakeLists.txt                      |  4 ++-
 libgnucash/scm/test/CMakeLists.txt                 | 29 ++++++++++++++++++++++
 ...ities.scm => test-libgnucash-scm-utilities.scm} |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 libgnucash/scm/test/CMakeLists.txt
 rename libgnucash/scm/test/{test-utilities.scm => test-libgnucash-scm-utilities.scm} (95%)