From 9b56a2cf047075f0e0ea02c24dda4ede4a14a9ca Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Thu, 22 Nov 2001 08:28:35 +0000
Subject: [PATCH] Use gnc-test-env.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5978 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/backend/file/test/Makefile.am     | 13 ++++++++-----
 src/backend/postgres/test/Makefile.am | 14 +++++++++-----
 src/engine/test/Makefile.am           | 12 +++++++-----
 src/network-utils/test/Makefile.am    | 10 ++++++----
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/backend/file/test/Makefile.am b/src/backend/file/test/Makefile.am
index 020cfc739c..59ae101907 100644
--- a/src/backend/file/test/Makefile.am
+++ b/src/backend/file/test/Makefile.am
@@ -15,11 +15,14 @@ TESTS = \
   test-xml-transaction \
   test-xml2-is-file
 
-TESTS_ENVIRONMENT = \
-  GNC_MODULE_PATH="${top_srcdir}/src/engine:${top_srcdir}/src/gnc-module:${top_srcdir}/src/backend/file" \
-  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/scm" \
-  LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file
+GNC_TEST_DEPS := \
+  --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/backend/file \
+  --guile-load-dir ${G_WRAP_MODULE_DIR}
+
+TESTS_ENVIRONMENT := \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_LTLIBRARIES = libgnc-test-file-stuff.la
 
diff --git a/src/backend/postgres/test/Makefile.am b/src/backend/postgres/test/Makefile.am
index f169ec9b58..824758e6a8 100644
--- a/src/backend/postgres/test/Makefile.am
+++ b/src/backend/postgres/test/Makefile.am
@@ -3,11 +3,15 @@ TESTS = \
   test-escape \
   run-tests.sh
 
-TESTS_ENVIRONMENT=\
-  GNC_MODULE_PATH=${top_srcdir}/src/engine::${top_srcdir}/src/backend/file:${top_srcdir}/src/backend/postgres:${top_srcdir}/src/scm \
-  GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:..:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine \
-  LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine
+GNC_TEST_DEPS := \
+  --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/backend/file \
+  --gnc-module-dir ${top_builddir}/src/backend/postgres \
+  --guile-load-dir ${G_WRAP_MODULE_DIR}
+
+TESTS_ENVIRONMENT := \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_PROGRAMS = \
   test-db \
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index 808ac53d31..34a18ab543 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -31,11 +31,13 @@ TESTS = \
   test-freq-spec \
   test-scm-query 
 
-TESTS_ENVIRONMENT = \
-  GNC_MODULE_PATH="${top_srcdir}/src/engine" \
-  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:../../gnc-module:${top_srcdir}/src/scm" \
-  LTDL_LIBRARY_PATH=../../gnc-module \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:..:${top_srcdir}/src/gnc-module
+GNC_TEST_DEPS := \
+  --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/engine \
+  --guile-load-dir ${G_WRAP_MODULE_DIR}
+
+TESTS_ENVIRONMENT := \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_PROGRAMS = \
   test-commodities \
diff --git a/src/network-utils/test/Makefile.am b/src/network-utils/test/Makefile.am
index 2e59bdaa8c..201bf6dd29 100644
--- a/src/network-utils/test/Makefile.am
+++ b/src/network-utils/test/Makefile.am
@@ -2,11 +2,13 @@ TESTS =  \
   test-link-module \
   test-load-module
 
-TESTS_ENVIRONMENT= \
-   GNC_MODULE_PATH=.. \
-   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:..:../../gnc-module:${top_srcdir}/lib \
-   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/network-utils
+GNC_TEST_DEPS := \
+  --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/network-utils \
+  --guile-load-dir ${G_WRAP_MODULE_DIR}
 
+TESTS_ENVIRONMENT := \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_PROGRAMS = \
   test-link-module