gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Jan 24 19:28:34 EST 2016
Updated via https://github.com/Gnucash/gnucash/commit/9b82651d (commit)
via https://github.com/Gnucash/gnucash/commit/2bf0fed4 (commit)
via https://github.com/Gnucash/gnucash/commit/7ab481a1 (commit)
from https://github.com/Gnucash/gnucash/commit/9be5a8be (commit)
commit 9b82651d3afe3d9fc429d881fb53115893cbe98f
Author: RobGowin <robgowin at gmail.com>
Date: Sat Jan 23 23:09:49 2016 -0600
Don't skip test under clang when using Guile 2.x
diff --git a/src/app-utils/test/test-scm-query-string.c b/src/app-utils/test/test-scm-query-string.c
index b98014c..ef4ca17 100644
--- a/src/app-utils/test/test-scm-query-string.c
+++ b/src/app-utils/test/test-scm-query-string.c
@@ -140,7 +140,7 @@ main (int argc, char **argv)
/* When built with clang, guile-1.8.8's scm_c_eval_string truncates all
* integer values to int32, which causes this test to fail.
*/
-#ifndef __clang__
+#if !(defined(__clang__)) || defined(HAVE_GUILE20)
scm_boot_guile (argc, argv, main_helper, NULL);
#endif
return 0;
commit 2bf0fed4a3897eede998f2ae4b6760c4ec546c4f
Author: RobGowin <robgowin at gmail.com>
Date: Sat Jan 23 16:45:34 2016 -0600
Change test to use LIBDIR to find dynamic libraries
diff --git a/src/gnc-module/test/test-dynload.c b/src/gnc-module/test/test-dynload.c
index 3b83242..def77bf 100644
--- a/src/gnc-module/test/test-dynload.c
+++ b/src/gnc-module/test/test-dynload.c
@@ -40,10 +40,16 @@ guile_main(void *closure, int argc, char ** argv)
gchar *logdomain = "gnc.module";
gchar *modpath;
guint loglevel = G_LOG_LEVEL_WARNING;
+ const char *libdir = g_getenv("LIBDIR");
TestErrorStruct check = { loglevel, logdomain, msg };
g_log_set_handler (logdomain, loglevel,
(GLogFunc)test_checked_handler, &check);
+ if (libdir == NULL)
+ {
+ libdir = "../.libs";
+ }
+
g_test_message(" test-dynload.c: testing dynamic linking of libgnc-module ...");
#ifdef G_OS_WIN32
/* MinGW builds libgnc-module-0.dll */
@@ -53,9 +59,16 @@ guile_main(void *closure, int argc, char ** argv)
* that means that g_module_build_path (), which uses ".so", doesn't
* build the right path name.
*/
- modpath = g_build_filename ("..", ".libs", "libgnc-module.dylib", NULL);
+ if (libdir == NULL)
+ {
+ modpath = g_build_filename ("..", ".libs", "libgnc-module.dylib", NULL);
+ }
+ else
+ {
+ modpath = g_build_filename (libdir, "libgnc-module.dylib", NULL);
+ }
#else /* Regular Unix */
- modpath = g_module_build_path ("../.libs", "gnc-module");
+ modpath = g_module_build_path (libdir, "gnc-module");
#endif
gmodule = g_module_open(modpath, 0);
commit 7ab481a134a888ebc0a7d0f6188517168c08bbb8
Author: RobGowin <robgowin at gmail.com>
Date: Sat Jan 23 12:16:11 2016 -0600
Add TEST_PATH variable to test
This allows the tests to run from some place other
than the current working directory.
diff --git a/src/backend/xml/test/test-real-data.sh.in b/src/backend/xml/test/test-real-data.sh.in
index 0c273bf..49e757b 100755
--- a/src/backend/xml/test/test-real-data.sh.in
+++ b/src/backend/xml/test/test-real-data.sh.in
@@ -3,7 +3,9 @@
#set -e
EXIT_VALUE=0
-
+if [ "x$TEST_PATH" == "x" ] ; then
+ TEST_PATH=.
+fi
for i in $SRCDIR/test-files/xml2/*.gml2 ; do
if [ ! -d $i ] ; then
@@ -15,9 +17,9 @@ for i in $SRCDIR/test-files/xml2/*.gml2 ; do
FILES=`perl $SRCDIR/grab-types.pl "gnc:$j" $i "$j/dataXXX.xml"`
if [ ! -z "$FILES" ] ; then
if [ "x$VERBOSE" = "xyes" ] ; then
- echo "Testing ./test-xml-$j $j/data*.xml # from `basename $i`:"
+ echo "Testing $TEST_PATH/test-xml-$j $j/data*.xml # from `basename $i`:"
fi
- eval "./test-xml-$j $FILES 2>/dev/null"
+ eval "$TEST_PATH/test-xml-$j $FILES 2>/dev/null"
if [ $? != 0 ] ; then
EXIT_VALUE=1
fi
Summary of changes:
src/app-utils/test/test-scm-query-string.c | 2 +-
src/backend/xml/test/test-real-data.sh.in | 8 +++++---
src/gnc-module/test/test-dynload.c | 17 +++++++++++++++--
3 files changed, 21 insertions(+), 6 deletions(-)
More information about the gnucash-changes
mailing list