r15234 - gnucash/branches/reshuffle-modules - Readd --library-dir to gnc-test-env and fix all tests that now lacked
Andreas Köhler
andi5 at cvs.gnucash.org
Tue Dec 19 04:07:26 EST 2006
Author: andi5
Date: 2006-12-19 04:07:24 -0500 (Tue, 19 Dec 2006)
New Revision: 15234
Trac: http://svn.gnucash.org/trac/changeset/15234
Modified:
gnucash/branches/reshuffle-modules/
gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am
gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-test-env
gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am
gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am
Log:
Readd --library-dir to gnc-test-env and fix all tests that now lacked
some, mostly gnc-module. Also avoid leading slashes for adapt-dirsep,
because they would be stripped.
Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1006
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1007
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
Modified: gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -22,7 +22,9 @@
--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
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -178,7 +178,8 @@
GNC_TEST_DEPS := \
--gnc-module-dir ${top_builddir}/src/engine \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/file
TESTS_ENVIRONMENT := \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
Modified: gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -51,7 +51,8 @@
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
SRCDIR=${srcdir} \
Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -31,7 +31,8 @@
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
- --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/gnc-test-env
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-test-env 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/gnc-test-env 2006-12-19 09:07:24 UTC (rev 15234)
@@ -3,7 +3,8 @@
!#
;; Spit out the environment variable settings needed based on
-;; arguments listing gnc-module-dirs and guile-load-dirs
+;; 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)
@@ -20,11 +21,13 @@
(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)
@@ -37,6 +40,9 @@
((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)))
@@ -44,7 +50,7 @@
;; The character set of everything except a directory separator as
;; necessary for string-tokenize below
(define char-set-path
- (char-set-adjoin
+ (char-set-adjoin
(char-set-delete char-set:graphic #\/)
#\ ))
@@ -78,22 +84,29 @@
(process-args! args)
(display "GNC_MODULE_PATH=\"${GNC_MODULE_PATH}")
-(display path-sep-str)
(display (adapt-dirsep
- (string-join (map
- (lambda (dir)
- (string-append dir "/.libs"))
- gnc-module-dirs)
- path-sep-str)))
+ (apply string-append
+ (map
+ (lambda (dir)
+ (string-append path-sep-str dir "/.libs"))
+ gnc-module-dirs))))
(display "\"")
(display " GUILE_LOAD_PATH=\"${GUILE_LOAD_PATH}")
-(display path-sep-str)
(display (adapt-dirsep
- (string-join guile-load-dirs
+ (string-join (append '("") guile-load-dirs)
path-sep-str)))
(display "\"")
+(display " LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}")
+(display (adapt-dirsep
+ (apply string-append
+ (map
+ (lambda (dir)
+ (string-append path-sep-str dir "/.libs"))
+ library-dirs))))
+(display "\"")
+
(if is-windows?
(begin
(display " PATH=${PATH}")
@@ -107,7 +120,8 @@
(begin
(display "; ")
(display " export GNC_MODULE_PATH;")
- (display " export GUILE_LOAD_PATH;")))
+ (display " export GUILE_LOAD_PATH;")
+ (display " export LD_LIBRARY_PATH;")))
;; Local Variables:
;; mode: scheme
Modified: gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -12,7 +12,8 @@
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -8,7 +8,8 @@
GNC_TEST_DEPS := \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils
+ --gnc-module-dir ${top_builddir}/src/network-utils \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -7,7 +7,8 @@
--gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --guile-load-dir ${top_builddir}/src/tax/us
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -7,7 +7,8 @@
--gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -6,7 +6,8 @@
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -5,7 +5,8 @@
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -5,7 +5,8 @@
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -5,7 +5,8 @@
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
+++ gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am 2006-12-19 09:07:24 UTC (rev 15234)
@@ -4,7 +4,8 @@
GNC_TEST_DEPS := \
--gnc-module-dir ${top_builddir}/src/tax/us \
--guile-load-dir ${top_builddir}/src/gnc-module \
- --guile-load-dir ${top_builddir}/src/tax/us
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
More information about the gnucash-changes
mailing list