gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ad94999b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5f18971a (commit)
	from  https://github.com/Gnucash/gnucash/commit/e80249ce (commit)



commit ad94999bef63568e99d1f1078f140bfd0b1aa81d
Merge: e80249ce2b 5f18971afb
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue May 28 15:08:38 2024 -0700

    Merge branch 'fix-tests' into stable


commit 5f18971afbf6a308f47b55db1afe7d6a47f5c0f6
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu May 23 16:57:50 2024 -0700

    SRFI-64 Handle run-test returning the runner instead of pass status.
    
    Guile 3.0.5 fixed what they thought was a bug whering run-test returned
    the rv of test-runner-on-final instead of the current test runner. Ctest
    considered the returned object to be a successful test and always reported
    the test passing.

diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index ef3c96aa45..ce12e8b3df 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -149,7 +149,11 @@ function(gnc_add_scheme_test _TARGET _SOURCE_FILE)
                   (format #t \"%load-compiled-path = ~s~%\" %load-compiled-path)
                   (error \"Loading guile/site file from outside build tree!\" filename))))
       (load-from-path \"${_TARGET}\")
-      (exit (run-test))"
+      (let ((result (run-test)))
+           (if (boolean? result)
+             (exit result)
+             (exit (test-runner-fail-count result))))
+"
     )
   endif()
   get_guile_env()



Summary of changes:
 common/cmake_modules/GncAddTest.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)