r23392 - gnucash/trunk - Use guile/python executable as found during configure for tests and some support scripts
Geert Janssens
gjanssens at code.gnucash.org
Wed Nov 13 10:51:44 EST 2013
Author: gjanssens
Date: 2013-11-13 10:51:44 -0500 (Wed, 13 Nov 2013)
New Revision: 23392
Trac: http://svn.gnucash.org/trac/changeset/23392
Added:
gnucash/trunk/src/bin/overrides/gnucash-make-guids.in
gnucash/trunk/src/engine/iso-currencies-to-c.in
gnucash/trunk/src/gnc-test-env.in
gnucash/trunk/src/optional/python-bindings/tests/runTests.py.in
Removed:
gnucash/trunk/src/bin/overrides/gnucash-make-guids
gnucash/trunk/src/engine/iso-currencies-to-c
gnucash/trunk/src/gnc-test-env
gnucash/trunk/src/optional/python-bindings/tests/runTests.py
Modified:
gnucash/trunk/configure.ac
gnucash/trunk/src/app-utils/test/Makefile.am
gnucash/trunk/src/app-utils/test/test-load-module
gnucash/trunk/src/backend/dbi/test/Makefile.am
gnucash/trunk/src/backend/sql/test/Makefile.am
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/bin/overrides/gnucash-build-env.in
gnucash/trunk/src/core-utils/test/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/engine/test/Makefile.am
gnucash/trunk/src/engine/test/test-create-account
gnucash/trunk/src/engine/test/test-scm-query-import
gnucash/trunk/src/gnc-module/test/Makefile.am
gnucash/trunk/src/gnc-module/test/test-gwrapped-c
gnucash/trunk/src/gnc-module/test/test-load-deps
gnucash/trunk/src/gnc-module/test/test-load-scm
gnucash/trunk/src/gnc-module/test/test-scm-dynload
gnucash/trunk/src/gnc-module/test/test-scm-init
gnucash/trunk/src/gnc-module/test/test-scm-module
gnucash/trunk/src/gnc-module/test/test-scm-multi
gnucash/trunk/src/gnome-utils/test/Makefile.am
gnucash/trunk/src/gnome-utils/test/test-load-module
gnucash/trunk/src/import-export/qif/test/Makefile.am
gnucash/trunk/src/import-export/test/Makefile.am
gnucash/trunk/src/optional/python-bindings/tests/Makefile.am
gnucash/trunk/src/register/register-core/test/Makefile.am
gnucash/trunk/src/register/register-gnome/test/Makefile.am
gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
gnucash/trunk/src/report/locale-specific/us/test/test-load-module
gnucash/trunk/src/report/report-gnome/test/Makefile.am
gnucash/trunk/src/report/report-gnome/test/test-load-module
gnucash/trunk/src/report/report-system/test/Makefile.am
gnucash/trunk/src/report/report-system/test/test-load-module
gnucash/trunk/src/report/standard-reports/test/Makefile.am
gnucash/trunk/src/report/standard-reports/test/test-load-module
gnucash/trunk/src/report/stylesheets/test/Makefile.am
gnucash/trunk/src/report/stylesheets/test/test-load-module
gnucash/trunk/src/report/utility-reports/test/Makefile.am
gnucash/trunk/src/report/utility-reports/test/test-load-module
gnucash/trunk/src/tax/us/test/Makefile.am
gnucash/trunk/src/tax/us/test/test-load-module
Log:
Use guile/python executable as found during configure for tests and some support scripts
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/configure.ac 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1253,9 +1253,7 @@
### makefiles, so that we don't have an opportunity to adjust them
### there.
-chmod u+x ${srcdir}/src/gnc-test-env
chmod u+x ${srcdir}/src/bin/generate-gnc-script
-chmod u+x ${srcdir}/src/bin/overrides/gnucash-make-guids
### --------------------------------------------------------------------------
### Makefile creation
@@ -1431,6 +1429,7 @@
packaging/win32/gnucash.iss
src/bin/gnucash.rc
src/app-utils/migratable-prefs.xml
+ src/engine/iso-currencies-to-c
src/gnome/gnucash.desktop.in
dnl # GSettings schema files
src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
@@ -1451,11 +1450,14 @@
src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
-
dnl # Please read doc/build-system before adding *anything* here
,
- dnl # commands go here, but we don't have any right now
+ dnl # init-commands go here
)
+# A few files need extra actions at creation time
+AC_CONFIG_FILES([src/gnc-test-env], [chmod u+x src/gnc-test-env])
+AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids])
+
AC_OUTPUT
Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/app-utils/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -29,8 +29,10 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
+ SRCDIR=${srcdir} \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
Modified: gnucash/trunk/src/app-utils/test/test-load-module
===================================================================
--- gnucash/trunk/src/app-utils/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/app-utils/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(setenv "GNC_UNINSTALLED" "1")
Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -41,7 +41,7 @@
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
SRCDIR=${srcdir} \
${gnc_dbd_dir_override} \
- $(shell ${top_srcdir}/src/gnc-test-env ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env ${GNC_TEST_DEPS})
EXTRA_DIST += \
test-dbi-stuff.h \
Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -21,7 +21,7 @@
TESTS_ENVIRONMENT = \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
SRCDIR=${srcdir} \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = $(TESTS)
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -198,7 +198,7 @@
GNC_TEST_FILES=test-files/xml2 \
SRCDIR=${srcdir} \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_LTLIBRARIES = libgnc-test-file-stuff.la
Modified: gnucash/trunk/src/bin/overrides/gnucash-build-env.in
===================================================================
--- gnucash/trunk/src/bin/overrides/gnucash-build-env.in 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/bin/overrides/gnucash-build-env.in 2013-11-13 15:51:44 UTC (rev 23392)
@@ -29,7 +29,8 @@
export GNC_DOC_PATH
fi
-eval `@-GNC_SRCDIR-@/src/gnc-test-env \
+set +x
+eval `${top_builddir}/src/gnc-test-env \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/backend/xml \
--gnc-module-dir ${top_builddir}/src/network-utils \
Deleted: gnucash/trunk/src/bin/overrides/gnucash-make-guids
===================================================================
--- gnucash/trunk/src/bin/overrides/gnucash-make-guids 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/bin/overrides/gnucash-make-guids 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,36 +0,0 @@
-#!/bin/sh
-exec gnucash-env guile -s "$0" "$@"
-!#
-
-(define (usage)
- (display "Usage: gnucash-make-guids [number-to-make (default is 100)]\n")
- (exit 1))
-
-(define args (cdr (program-arguments)))
-(define num-to-make 100)
-
-;; Too many arguments
-(if (> (length args) 1)
- (usage))
-
-(if (= (length args) 1)
- (let ((arg (string->number (car args))))
- (if (not (number? arg))
- (usage))
- (set! arg (inexact->exact arg))
- (if (<= arg 0)
- (usage))
- (set! num-to-make arg)))
-
-(use-modules (gnucash gnc-module))
-(gnc:module-system-init)
-(gnc:module-load "gnucash/engine" 0)
-
-(let loop ((remaining num-to-make))
- (display (guid-new-return)) (newline)
- (if (> remaining 1)
- (loop (- remaining 1))))
-
-;; Local Variables:
-;; mode: scheme
-;; End:
Copied: gnucash/trunk/src/bin/overrides/gnucash-make-guids.in (from rev 23391, gnucash/trunk/src/bin/overrides/gnucash-make-guids)
===================================================================
--- gnucash/trunk/src/bin/overrides/gnucash-make-guids.in (rev 0)
+++ gnucash/trunk/src/bin/overrides/gnucash-make-guids.in 2013-11-13 15:51:44 UTC (rev 23392)
@@ -0,0 +1,36 @@
+#!/bin/sh
+exec gnucash-env @GUILE@ -s "$0" "$@"
+!#
+
+(define (usage)
+ (display "Usage: gnucash-make-guids [number-to-make (default is 100)]\n")
+ (exit 1))
+
+(define args (cdr (program-arguments)))
+(define num-to-make 100)
+
+;; Too many arguments
+(if (> (length args) 1)
+ (usage))
+
+(if (= (length args) 1)
+ (let ((arg (string->number (car args))))
+ (if (not (number? arg))
+ (usage))
+ (set! arg (inexact->exact arg))
+ (if (<= arg 0)
+ (usage))
+ (set! num-to-make arg)))
+
+(use-modules (gnucash gnc-module))
+(gnc:module-system-init)
+(gnc:module-load "gnucash/engine" 0)
+
+(let loop ((remaining num-to-make))
+ (display (guid-new-return)) (newline)
+ (if (> remaining 1)
+ (loop (- remaining 1))))
+
+;; Local Variables:
+;; mode: scheme
+;; End:
Modified: gnucash/trunk/src/core-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/core-utils/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -27,7 +27,7 @@
TESTS_ENVIRONMENT = \
SRCDIR=${srcdir} \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-gnc-uri-utils \
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/engine/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -206,8 +206,8 @@
endif
iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
- -chmod u+x ${srcdir}/iso-currencies-to-c
- ${srcdir}/iso-currencies-to-c "${srcdir}"
+ -chmod u+x ./iso-currencies-to-c
+ ./iso-currencies-to-c "${srcdir}"
BUILT_SOURCES = iso-4217-currencies.c
Deleted: gnucash/trunk/src/engine/iso-currencies-to-c
===================================================================
--- gnucash/trunk/src/engine/iso-currencies-to-c 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/engine/iso-currencies-to-c 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,99 +0,0 @@
-#!/bin/sh
-exec guile -s $0 "$@"
-!#
-
-(if (< (length (command-line)) 2)
- (begin
- (display "Missing command line argument \"source directory\"")
- (exit 1)))
-
-(define *srcdir* (list-ref (command-line) 1))
-(define *currency-file* (string-append *srcdir* "/" "iso-4217-currencies.scm"))
-(define *c-file-name* "iso-4217-currencies.c")
-
-(define (generate-currency-c-code form output-port)
- ;; Check for correct number of arguments
- (if (and (list? form)
- (eq? 9 (length form)))
- ;; Assign arguments
- (let ((fullname (list-ref form 0))
- (unitname (list-ref form 1))
- (partname (list-ref form 2))
- (namespace (list-ref form 3))
- (mnemonic (list-ref form 4))
- (exchange-code (list-ref form 5))
- (parts-per-unit (list-ref form 6))
- (smallest-fraction (list-ref form 7))
- (local-symbol (list-ref form 8)))
- ;; Check for correct types of arguments
- (if (and (string? fullname)
- (string? unitname)
- (string? partname)
- (string? namespace)
- (string? mnemonic)
- (string? exchange-code)
- (number? parts-per-unit)
- (number? smallest-fraction)
- (string? local-symbol))
-
- ;; And print the output line
- (format
- output-port "
- {
- const char *fullname = ~S;
- gnc_commodity *c = gnc_commodity_new(book,
- CUR_I18N(fullname),
- ~S,
- ~S,
- ~S,
- ~S);\n
- if(!c) {
- PWARN(\"failed to create commodity for currency %s\", fullname);
- } else {
- if(!gnc_commodity_table_insert(table, c)) {
- PWARN(\"failed to insert %s into commodity table\", fullname);
- }
- }
- gnc_commodity_set_user_symbol(c, ~S);
- }\n"
- fullname
- namespace
- mnemonic
- exchange-code
- smallest-fraction
- local-symbol)
-
- ;; Sorry, code doubling of the error message, but whatever.
- (begin
- (display "Bad currency data (wrong column data) at line: ")
- (display form)
- (newline)
- #f)))
-
- (begin
- (display "Bad currency data (wrong number of columns) at line: ")
- (display form)
- (newline)
- #f)))
-
-(define (generate-currencies-c-code)
- (call-with-input-file *currency-file*
- (lambda (input-port)
- (call-with-output-file *c-file-name*
- (lambda (output-port)
- (let loop ((form (read input-port)))
- (if (eof-object? form)
- #t
- (if (generate-currency-c-code form output-port)
- (loop (read input-port))
- #f))))))))
-
-(if (not (generate-currencies-c-code))
- (begin
- (display "Unable to generate iso-4217 currency C code.\n")
- (exit 1))
- (exit 0))
-
-;; Local Variables:
-;; mode: scheme
-;; End:
Copied: gnucash/trunk/src/engine/iso-currencies-to-c.in (from rev 23391, gnucash/trunk/src/engine/iso-currencies-to-c)
===================================================================
--- gnucash/trunk/src/engine/iso-currencies-to-c.in (rev 0)
+++ gnucash/trunk/src/engine/iso-currencies-to-c.in 2013-11-13 15:51:44 UTC (rev 23392)
@@ -0,0 +1,99 @@
+#!/bin/sh
+exec @GUILE@ -s $0 "$@"
+!#
+
+(if (< (length (command-line)) 2)
+ (begin
+ (display "Missing command line argument \"source directory\"")
+ (exit 1)))
+
+(define *srcdir* (list-ref (command-line) 1))
+(define *currency-file* (string-append *srcdir* "/" "iso-4217-currencies.scm"))
+(define *c-file-name* "iso-4217-currencies.c")
+
+(define (generate-currency-c-code form output-port)
+ ;; Check for correct number of arguments
+ (if (and (list? form)
+ (eq? 9 (length form)))
+ ;; Assign arguments
+ (let ((fullname (list-ref form 0))
+ (unitname (list-ref form 1))
+ (partname (list-ref form 2))
+ (namespace (list-ref form 3))
+ (mnemonic (list-ref form 4))
+ (exchange-code (list-ref form 5))
+ (parts-per-unit (list-ref form 6))
+ (smallest-fraction (list-ref form 7))
+ (local-symbol (list-ref form 8)))
+ ;; Check for correct types of arguments
+ (if (and (string? fullname)
+ (string? unitname)
+ (string? partname)
+ (string? namespace)
+ (string? mnemonic)
+ (string? exchange-code)
+ (number? parts-per-unit)
+ (number? smallest-fraction)
+ (string? local-symbol))
+
+ ;; And print the output line
+ (format
+ output-port "
+ {
+ const char *fullname = ~S;
+ gnc_commodity *c = gnc_commodity_new(book,
+ CUR_I18N(fullname),
+ ~S,
+ ~S,
+ ~S,
+ ~S);\n
+ if(!c) {
+ PWARN(\"failed to create commodity for currency %s\", fullname);
+ } else {
+ if(!gnc_commodity_table_insert(table, c)) {
+ PWARN(\"failed to insert %s into commodity table\", fullname);
+ }
+ }
+ gnc_commodity_set_user_symbol(c, ~S);
+ }\n"
+ fullname
+ namespace
+ mnemonic
+ exchange-code
+ smallest-fraction
+ local-symbol)
+
+ ;; Sorry, code doubling of the error message, but whatever.
+ (begin
+ (display "Bad currency data (wrong column data) at line: ")
+ (display form)
+ (newline)
+ #f)))
+
+ (begin
+ (display "Bad currency data (wrong number of columns) at line: ")
+ (display form)
+ (newline)
+ #f)))
+
+(define (generate-currencies-c-code)
+ (call-with-input-file *currency-file*
+ (lambda (input-port)
+ (call-with-output-file *c-file-name*
+ (lambda (output-port)
+ (let loop ((form (read input-port)))
+ (if (eof-object? form)
+ #t
+ (if (generate-currency-c-code form output-port)
+ (loop (read input-port))
+ #f))))))))
+
+(if (not (generate-currencies-c-code))
+ (begin
+ (display "Unable to generate iso-4217 currency C code.\n")
+ (exit 1))
+ (exit 0))
+
+;; Local Variables:
+;; mode: scheme
+;; End:
Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/engine/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -65,9 +65,10 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
SRCDIR=${srcdir} \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link \
Modified: gnucash/trunk/src/engine/test/test-create-account
===================================================================
--- gnucash/trunk/src/engine/test/test-create-account 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/engine/test/test-create-account 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,2 +1,2 @@
#!/bin/sh
-guile -l $SRCDIR/test-create-account.scm -c "(exit (run-test))"
+${GUILE} -l $SRCDIR/test-create-account.scm -c "(exit (run-test))"
Modified: gnucash/trunk/src/engine/test/test-scm-query-import
===================================================================
--- gnucash/trunk/src/engine/test/test-scm-query-import 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/engine/test/test-scm-query-import 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,4 +1,2 @@
#!/bin/sh
-guile -l $SRCDIR/test-scm-query-import.scm -c "(exit (run-test))"
-#echo "run -l $SRCDIR/test-scm-query-import.scm -c \"(exit (run-test))\""
-#gdb /afs/sipb/project/guile/bin/guile
+${GUILE} -l $SRCDIR/test-scm-query-import.scm -c "(exit (run-test))"
\ No newline at end of file
Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -48,7 +48,8 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ GUILE="${GUILE}" \
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-load-c \
Modified: gnucash/trunk/src/gnc-module/test/test-gwrapped-c
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-gwrapped-c 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-gwrapped-c 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-guile -c "(use-modules (gnucash unittest-support))
+${GUILE} -c "(use-modules (gnucash unittest-support))
(define log-domain \"gnc.module\")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
Modified: gnucash/trunk/src/gnc-module/test/test-load-deps
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-load-deps 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-load-deps 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s $0 "$@"
+exec ${GUILE} -s $0 "$@"
!#
;; test-load-deps.scm : load gnc-mod-baz, which depends on gnc-mod-foo
Modified: gnucash/trunk/src/gnc-module/test/test-load-scm
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-load-scm 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-load-scm 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s $0 "$@"
+exec ${GUILE} -s $0 "$@"
!#
(use-modules (gnucash unittest-support))
Modified: gnucash/trunk/src/gnc-module/test/test-scm-dynload
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-dynload 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-scm-dynload 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,6 +1,6 @@
#! /bin/sh
echo " test-scm-dynload: testing dynamic-link of libgnc-module from Scheme.";
-exec guile -s $0 "$@"
+exec ${GUILE} -s $0 "$@"
!#
(if (or (string=? (version) "1.3")
Modified: gnucash/trunk/src/gnc-module/test/test-scm-init
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-init 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-scm-init 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,6 +1,6 @@
#! /bin/sh
echo " test-scm-init: testing Scheme-only module system init. ";
-exec guile -s $0 "$@"
+exec ${GUILE} -s $0 "$@"
!#
(use-modules (gnucash unittest-support))
Modified: gnucash/trunk/src/gnc-module/test/test-scm-module
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-scm-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-guile -c "(use-modules (gnucash unittest-support))
+${GUILE} -c "(use-modules (gnucash unittest-support))
(define log-domain \"gnc.module\")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
Modified: gnucash/trunk/src/gnc-module/test/test-scm-multi
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-multi 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-module/test/test-scm-multi 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s $0 "$@"
+exec ${GUILE} -s $0 "$@"
!#
(use-modules (gnucash unittest-support))
(define log-domain "gnc.module")
Deleted: gnucash/trunk/src/gnc-test-env
===================================================================
--- gnucash/trunk/src/gnc-test-env 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnc-test-env 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,130 +0,0 @@
-#!/bin/sh
-exec guile -s $0 "$@"
-!#
-
-;; Spit out the environment variable settings needed based on
-;; arguments listing gnc-module-dirs, guile-load-dirs, and
-;; library-dirs
-
-(use-modules (srfi srfi-13) (srfi srfi-14)) ;; for string-tokenize
-(debug-enable 'backtrace)
-(debug-enable 'debug)
-(read-enable 'positions)
-
-;; Are we on MS Windows here? If yes, make this a #t.
-;; (utsname:sysname (uname)) wasn't available in my guile-1.6.7 on
-;; mingw, so I don't know an automated way to do this so far.
-(define is-windows?
- (let ((ostype (getenv "OSTYPE")))
- (and ostype
- (string=? ostype "msys"))))
-
-(define args (cdr (command-line)))
-(define display-exports? #t)
-
-(define gnc-module-dirs '())
-(define guile-load-dirs '())
-(define library-dirs '())
-
-(define (usage-death)
- (display "Usage: gnc-test-env [ --no-exports ]\n")
- (display " [ (--gnc-module-dir dir | \n")
- (display " --guile-load-dir dir | \n")
- (display " --library-dir dir) ... ]\n")
- (exit 1))
-
-(define (process-args! args)
- (let loop ((rest args))
- (cond
- ((null? rest) #t)
- ((string=? "--gnc-module-dir" (car rest))
- (set! gnc-module-dirs (cons (cadr rest) gnc-module-dirs))
- (loop (cddr rest)))
- ((string=? "--guile-load-dir" (car rest))
- (set! guile-load-dirs (cons (cadr rest) guile-load-dirs))
- (loop (cddr rest)))
- ((string=? "--library-dir" (car rest))
- (set! library-dirs (cons (cadr rest) library-dirs))
- (loop (cddr rest)))
- (else (usage-death))))
- (set! gnc-module-dirs (reverse gnc-module-dirs))
- (set! guile-load-dirs (reverse guile-load-dirs)))
-
-;; The character set of everything except a directory separator as
-;; necessary for string-tokenize below
-(define char-set-path
- (char-set-adjoin
- (char-set-delete char-set:graphic #\/)
- #\ ))
-
-;; The directory separator string.
-(define dir-separator-string
- (if is-windows?
- "\\\\" ;; Needs to be quoted twice because of additional shell quoting
- "/"))
-
-;; The path separator string; only needed for GUILE_LOAD_PATH
-(define path-sep-str
- (if is-windows?
- ";"
- ":"))
-
-;; Adapt the directory separator character in the given PATH and
-;; return the result.
-(define (adapt-dirsep path)
- (string-join
- (string-tokenize path char-set-path)
- dir-separator-string))
-
-(if (and (not (null? args))
- (string=? "--no-exports" (car args)))
- (begin
- (set! display-exports? #f)
- (set! args (cdr args))))
-
-(if (null? args) (exit 0))
-
-(process-args! args)
-
-(define (get-dir-adder env-name dir-list item-suffix separator)
- (string-append env-name "=\""
- (apply string-append
- (map
- (lambda (dir)
- (string-append dir item-suffix separator))
- dir-list))
- "${" env-name "}\" "))
-
-(display
- (adapt-dirsep
- (get-dir-adder "GNC_MODULE_PATH" gnc-module-dirs "/.libs" path-sep-str)))
-
-(display
- (adapt-dirsep
- (get-dir-adder "GUILE_LOAD_PATH" guile-load-dirs "" path-sep-str)))
-
-(display
- (adapt-dirsep
- (get-dir-adder "LD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
-
-(display
- (adapt-dirsep
- (get-dir-adder "DYLD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
-
-(if is-windows?
- (display
- (get-dir-adder "PATH" library-dirs "/.libs" ":")))
-
-(if display-exports?
- (begin
- (display "; ")
- (display " export GNC_MODULE_PATH;")
- (display " export GUILE_LOAD_PATH;")
- (display " export LD_LIBRARY_PATH;")
- (display " export DYLD_LIBRARY_PATH;")
- (if is-windows?
- (display " export PATH;"))))
-
-;; Local Variables:
-;; mode: scheme
-;; End:
Copied: gnucash/trunk/src/gnc-test-env.in (from rev 23391, gnucash/trunk/src/gnc-test-env)
===================================================================
--- gnucash/trunk/src/gnc-test-env.in (rev 0)
+++ gnucash/trunk/src/gnc-test-env.in 2013-11-13 15:51:44 UTC (rev 23392)
@@ -0,0 +1,130 @@
+#!/bin/sh
+exec @GUILE@ -s $0 "$@"
+!#
+
+;; Spit out the environment variable settings needed based on
+;; arguments listing gnc-module-dirs, guile-load-dirs, and
+;; library-dirs
+
+(use-modules (srfi srfi-13) (srfi srfi-14)) ;; for string-tokenize
+(debug-enable 'backtrace)
+(debug-enable 'debug)
+(read-enable 'positions)
+
+;; Are we on MS Windows here? If yes, make this a #t.
+;; (utsname:sysname (uname)) wasn't available in my guile-1.6.7 on
+;; mingw, so I don't know an automated way to do this so far.
+(define is-windows?
+ (let ((ostype (getenv "OSTYPE")))
+ (and ostype
+ (string=? ostype "msys"))))
+
+(define args (cdr (command-line)))
+(define display-exports? #t)
+
+(define gnc-module-dirs '())
+(define guile-load-dirs '())
+(define library-dirs '())
+
+(define (usage-death)
+ (display "Usage: gnc-test-env [ --no-exports ]\n")
+ (display " [ (--gnc-module-dir dir | \n")
+ (display " --guile-load-dir dir | \n")
+ (display " --library-dir dir) ... ]\n")
+ (exit 1))
+
+(define (process-args! args)
+ (let loop ((rest args))
+ (cond
+ ((null? rest) #t)
+ ((string=? "--gnc-module-dir" (car rest))
+ (set! gnc-module-dirs (cons (cadr rest) gnc-module-dirs))
+ (loop (cddr rest)))
+ ((string=? "--guile-load-dir" (car rest))
+ (set! guile-load-dirs (cons (cadr rest) guile-load-dirs))
+ (loop (cddr rest)))
+ ((string=? "--library-dir" (car rest))
+ (set! library-dirs (cons (cadr rest) library-dirs))
+ (loop (cddr rest)))
+ (else (usage-death))))
+ (set! gnc-module-dirs (reverse gnc-module-dirs))
+ (set! guile-load-dirs (reverse guile-load-dirs)))
+
+;; The character set of everything except a directory separator as
+;; necessary for string-tokenize below
+(define char-set-path
+ (char-set-adjoin
+ (char-set-delete char-set:graphic #\/)
+ #\ ))
+
+;; The directory separator string.
+(define dir-separator-string
+ (if is-windows?
+ "\\\\" ;; Needs to be quoted twice because of additional shell quoting
+ "/"))
+
+;; The path separator string; only needed for GUILE_LOAD_PATH
+(define path-sep-str
+ (if is-windows?
+ ";"
+ ":"))
+
+;; Adapt the directory separator character in the given PATH and
+;; return the result.
+(define (adapt-dirsep path)
+ (string-join
+ (string-tokenize path char-set-path)
+ dir-separator-string))
+
+(if (and (not (null? args))
+ (string=? "--no-exports" (car args)))
+ (begin
+ (set! display-exports? #f)
+ (set! args (cdr args))))
+
+(if (null? args) (exit 0))
+
+(process-args! args)
+
+(define (get-dir-adder env-name dir-list item-suffix separator)
+ (string-append env-name "=\""
+ (apply string-append
+ (map
+ (lambda (dir)
+ (string-append dir item-suffix separator))
+ dir-list))
+ "${" env-name "}\" "))
+
+(display
+ (adapt-dirsep
+ (get-dir-adder "GNC_MODULE_PATH" gnc-module-dirs "/.libs" path-sep-str)))
+
+(display
+ (adapt-dirsep
+ (get-dir-adder "GUILE_LOAD_PATH" guile-load-dirs "" path-sep-str)))
+
+(display
+ (adapt-dirsep
+ (get-dir-adder "LD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
+
+(display
+ (adapt-dirsep
+ (get-dir-adder "DYLD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
+
+(if is-windows?
+ (display
+ (get-dir-adder "PATH" library-dirs "/.libs" ":")))
+
+(if display-exports?
+ (begin
+ (display "; ")
+ (display " export GNC_MODULE_PATH;")
+ (display " export GUILE_LOAD_PATH;")
+ (display " export LD_LIBRARY_PATH;")
+ (display " export DYLD_LIBRARY_PATH;")
+ (if is-windows?
+ (display " export PATH;"))))
+
+;; Local Variables:
+;; mode: scheme
+;; End:
Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -28,9 +28,10 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
SRCDIR=${srcdir} \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link-module test-gnc-recurrence
Modified: gnucash/trunk/src/gnome-utils/test/test-load-module
===================================================================
--- gnucash/trunk/src/gnome-utils/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/gnome-utils/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s $0
+exec ${GUILE} -s $0
!#
(setenv "GNC_UNINSTALLED" "1")
Modified: gnucash/trunk/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -41,7 +41,7 @@
TESTS_ENVIRONMENT = \
GNC_TEST_FILES=${srcdir}/test-files \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link \
Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -48,7 +48,7 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link \
Modified: gnucash/trunk/src/optional/python-bindings/tests/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/python-bindings/tests/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/optional/python-bindings/tests/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,12 +1,42 @@
-
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/libqof/qof \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
+ --library-dir ${top_builddir}/src/app-utils
+
TESTS_ENVIRONMENT = \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ PYTHON=${PYTHON} \
PYTHONPATH=$(PYTHONPATH):$(top_builddir)/src/optional/python-bindings \
PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings/.libs \
PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/test-core/ \
PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/src/test-core/ \
PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/test-core/.libs \
- $(top_builddir)/src/bin/overrides/gnucash-build-env $(PYTHON)
+ $(shell $(top_builddir)/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets below, instead of the usual @... at . This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions. *sigh*
+
+runTests.py: runTests.py.in ${top_builddir}/config.status Makefile
+ rm -f $@.tmp
+ sed < $< > $@.tmp \
+ -e 's#@-PYTHON-@#${PYTHON}#'
+ mv $@.tmp $@
+ chmod u+x $@
+
+CLEANFILES = runTests.py
+
TESTS = runTests.py
clean-local:
Deleted: gnucash/trunk/src/optional/python-bindings/tests/runTests.py
===================================================================
--- gnucash/trunk/src/optional/python-bindings/tests/runTests.py 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/optional/python-bindings/tests/runTests.py 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,18 +0,0 @@
-import unittest
-import os
-
-os.environ["GNC_UNINSTALLED"] = "1"
-
-from test import test_support
-
-from test_book import TestBook
-from test_account import TestAccount
-from test_split import TestSplit
-from test_transaction import TestTransaction
-from test_business import TestBusiness
-
-def test_main():
- test_support.run_unittest(TestBook, TestAccount, TestSplit, TestTransaction, TestBusiness)
-
-if __name__ == '__main__':
- test_main()
Copied: gnucash/trunk/src/optional/python-bindings/tests/runTests.py.in (from rev 23391, gnucash/trunk/src/optional/python-bindings/tests/runTests.py)
===================================================================
--- gnucash/trunk/src/optional/python-bindings/tests/runTests.py.in (rev 0)
+++ gnucash/trunk/src/optional/python-bindings/tests/runTests.py.in 2013-11-13 15:51:44 UTC (rev 23392)
@@ -0,0 +1,20 @@
+#!@-PYTHON-@
+
+import unittest
+import os
+
+os.environ["GNC_UNINSTALLED"] = "1"
+
+from test import test_support
+
+from test_book import TestBook
+from test_account import TestAccount
+from test_split import TestSplit
+from test_transaction import TestTransaction
+from test_business import TestBusiness
+
+def test_main():
+ test_support.run_unittest(TestBook, TestAccount, TestSplit, TestTransaction, TestBusiness)
+
+if __name__ == '__main__':
+ test_main()
Property changes on: gnucash/trunk/src/optional/python-bindings/tests/runTests.py.in
___________________________________________________________________
Added: svn:executable
+ *
Modified: gnucash/trunk/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/register/register-core/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -6,7 +6,7 @@
#
#TESTS_ENVIRONMENT := \
-# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+# $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link-module
Modified: gnucash/trunk/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/register/register-gnome/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -6,7 +6,7 @@
#
#TESTS_ENVIRONMENT := \
-# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+# $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
test-link-module
Modified: gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/locale-specific/us/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -14,7 +14,9 @@
--library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT = \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = test-link-module
Modified: gnucash/trunk/src/report/locale-specific/us/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/locale-specific/us/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s $0
+exec ${GUILE} -s $0
!#
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/report-gnome/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -51,8 +51,9 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = test-link-module
Modified: gnucash/trunk/src/report/report-gnome/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/report-gnome/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(debug-enable 'debug)
Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -51,13 +51,14 @@
--library-dir ${top_builddir}/src/gnc-module
$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
- echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
chmod a+x $@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = test-link-module
Modified: gnucash/trunk/src/report/report-system/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/report-system/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/report-system/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(debug-enable 'debug)
Modified: gnucash/trunk/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/standard-reports/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -41,13 +41,14 @@
--library-dir ${top_builddir}/src/gnc-module
$(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
- echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
+ echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
chmod a+x $@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
SCM_TEST_HELPERS = \
@@ -70,7 +71,7 @@
endif
interp:
- $(TESTS_ENVIRONMENT) guile --debug
+ $(TESTS_ENVIRONMENT) ${GUILE} --debug
debug:
$(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST))
Modified: gnucash/trunk/src/report/standard-reports/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/standard-reports/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(display " testing standard report module load ... ")
Modified: gnucash/trunk/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/stylesheets/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -32,7 +32,8 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
Modified: gnucash/trunk/src/report/stylesheets/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/stylesheets/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(setenv "GNC_UNINSTALLED" "1")
Modified: gnucash/trunk/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/utility-reports/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -27,7 +27,8 @@
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
+ GUILE="${GUILE}" \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
Modified: gnucash/trunk/src/report/utility-reports/test/test-load-module
===================================================================
--- gnucash/trunk/src/report/utility-reports/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/report/utility-reports/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(display " testing utility report module load ... ")
Modified: gnucash/trunk/src/tax/us/test/Makefile.am
===================================================================
--- gnucash/trunk/src/tax/us/test/Makefile.am 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/tax/us/test/Makefile.am 2013-11-13 15:51:44 UTC (rev 23392)
@@ -9,7 +9,8 @@
--library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT = \
- $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+ GUILE="${GUILE}" \
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS=test-link-module
test_link_module_SOURCES=test-link-module.c
Modified: gnucash/trunk/src/tax/us/test/test-load-module
===================================================================
--- gnucash/trunk/src/tax/us/test/test-load-module 2013-11-13 15:51:24 UTC (rev 23391)
+++ gnucash/trunk/src/tax/us/test/test-load-module 2013-11-13 15:51:44 UTC (rev 23392)
@@ -1,5 +1,5 @@
#! /bin/sh
-exec guile -s "$0"
+exec ${GUILE} -s "$0"
!#
(display " testing US tax info module load ... ")
More information about the gnucash-changes
mailing list