unset XDG environment variable during testcases, as they can screw things up badly

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3f11977b044f4bc278cc3d9e7295c4a949176286..9ce4b019d8c12c0597145b601c413276445562a7 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -86,7 +86,7 @@ check_PROGRAMS = \
  test_gnunet_prefix
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index d5e59619e6590c6473b082ca287ec3df13616efa..373847fde2600a3df91afeda1e35858e5890644b 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -68,7 +68,7 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 21366484b4b1474de9c99665d5a6f306700a1934..206f964cccc1d4e7419eacf0b0289cb26e65e2fe 100644 (file)
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -44,7 +44,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index aa3612c2d9143f1de288f4182f5fae3d7c8f2fa2..af7f6bd585e2835fbcebe0300959dbfe693f8699 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -113,7 +113,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/auction/Makefile.am b/src/auction/Makefile.am
index 87f917283ed85eca9117e141a89c2940585109c1..28b52f3d561d84791f4dc8a23c30186bdbfc90ba 100644 (file)
--- a/src/auction/Makefile.am
+++ b/src/auction/Makefile.am
@@ -69,6 +69,6 @@ check_SCRIPTS = \
  test_auction_create.sh
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 endif

diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 53d17dd9c293a1c3f9c420ad5085758f97ffd093..a5416c653d8ec4ac26f47010265b50d8c77c366a 100644 (file)
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -225,7 +225,7 @@ test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  $(check_PROGRAMS)
 endif

diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index c63434f94809bb99cc0b5fc00f7b842b3c6f71ee..c04d4c2079abc2511aed4e65219681dfd093ea4c 100644 (file)
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -71,7 +71,7 @@ check_PROGRAMS = \
  test_consensus_api
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index f61173a66f63dc07075179da24d8c0650c07dc66..cc29381445f5c8d93723a6bd1eb022adcf6730c6 100644 (file)
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -101,7 +101,7 @@ libexec_PROGRAMS += \
   $(AUDIO_HELPER_RECD) \
   $(AUDIO_HELPER_PLAY)
 
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 if ENABLE_TEST_RUN
 TESTS = $(AUDIO_TESTS)
 endif

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index ed80bae73ac8d127d93a73eb459b33e38e6e133f..2723151c5ee451fd6a961ff52034b479054383e3 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -71,7 +71,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 9b66636e5ebab14ed4e9644a4b809576094f63d3..431b3179e9e9734a7edafe939ca3222cbfc3a72d 100644 (file)
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -127,7 +127,7 @@ check_PROGRAMS = \
  $(POSTGRES_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 1e7619d82392f7dc12f3ccc756d8e524b54e0913..1285020de2796a5beab609ad09f877d42b3bd757 100644 (file)
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -175,7 +175,7 @@ check_PROGRAMS = \
   $(POSTGRES_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 1a174165cc798651757277fd4220160fa1abf39b..b4c03ba607eec8471b9ce8e5956214eaad488c18 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -180,7 +180,7 @@ if HAVE_EXPERIMENTAL
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index f5fcf3782e8883e2d4d2f6735328a9fd95309c3d..f74c41fc58e708215a4309c2e09005a6aade5199 100644 (file)
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -112,7 +112,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index c6a6203434c3dab477f00a553a2e5f8e9b01578b..c443211511291101c912b0af83da53f88ddd82ae 100644 (file)
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -73,7 +73,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = $(check_PROGRAMS) 
 endif
 

diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 316f6915828699d25c2d4081e28c6b989c87ed5f..85c4767c0b016a6c1492f18cba512579969c1ba4 100644 (file)
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -27,7 +27,7 @@ check_PROGRAMS = \
  test_fragmentation_parallel
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 34f44f574e06822e2e22e16dede60785ef563b4e..344eb5a74a593601f752f050819a99f57681cf56 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -288,7 +288,7 @@ endif
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY)
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; $(MONKEY)
 TESTS = \
  test_fs_directory \
  test_fs_download \

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 0b65a3d174a784b847eca16368e1cd50d9df0d72..8f27890d707fe7478de9bcf7b5b190724d16e413 100644 (file)
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -264,7 +264,7 @@ check_SCRIPTS = \
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = $(check_SCRIPTS)
 endif
 endif

diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am
index e3275124761e85a18ca642c7f1bbbcc70112234a..2fb427c69016e26d52ed7a765172a7ceed9e7fe4 100644 (file)
--- a/src/gnsrecord/Makefile.am
+++ b/src/gnsrecord/Makefile.am
@@ -22,7 +22,7 @@ check_PROGRAMS = \
  test_gnsrecord_block_expiration
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
   $(check_PROGRAMS) \
   $(check_SCRIPTS)

diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index 563bcafb2c4c605e186de499b2a0be3ab3bbb217..79003301b8be023c86ba8240653bf04c74ff872f 100644 (file)
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -29,7 +29,7 @@ check_PROGRAMS = \
  test_friend_hello
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 31ce5bf62391b4ee2d8b3bb8a85bf6c51e2de5f9..17f0bdfa08cf670411f7856c737e76db5642ee06 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -70,7 +70,7 @@ endif
 
 if HAVE_MHD
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  $(check_PROGRAMS)
 endif

diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index c6f6625f4c46fe7fbaf3eefaab0837c8b170620e..94e8c5e94e72d00abf4d1e92ed25002f96ef4493 100644 (file)
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -92,7 +92,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS) 
 endif
 

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 4e96ee1735719df430d14d3bcd8b38726b716087..6fff0b407b817807b88df6a27b8dce1312bf96f2 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -27,7 +27,7 @@ endif
 
 if HAVE_MHD
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 if HAVE_LIBGNURL
 TESTS = \
  $(check_SCRIPTS)

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index b1f422765322eb8684c07cd664a5b4e28d887d3f..d5bb0d46ba09101c0bb0637fb83b0b3a2b399a2a 100644 (file)
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -55,7 +55,7 @@ check_PROGRAMS = \
  test_multicast_multipeer
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index cb4559552706bac5b618a34fb983df5ceb6bcc7f..89d7bffee2823ef974b38f8746bf45ac1f0dd50e 100644 (file)
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -56,7 +56,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
   $(check_PROGRAMS)
 endif

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 23ce477dd9b18bff00adb6efa0526b22609d00b6..a441f5d700dde5f5b08e317be173ad1d58dea34f 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -78,7 +78,7 @@ endif
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
   $(check_PROGRAMS) \
   $(check_SCRIPTS)

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 3dc001dd79851e77cc5effa74f43b079b3390e1c..f0d5639a1627487aed94eddc1e2632a6d76e271f 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -93,7 +93,7 @@ gnunet_service_nat_LDADD = \
 #  test_stun
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 9a163b1609c91f2b74b5817feaf5e155d22e8cc1..61848978019f7752e6c16df660926be49604e1ab 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -82,7 +82,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index c79c3ac6880ea19bd05905d78dd35ff9dcf90513..648957a05fe49a6d86fd3718c70d01a384feef42 100644 (file)
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -30,7 +30,7 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_SCRIPTS)
 endif
 

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index dd41cf15a1b3b067074a862b13c4df351470defb..eeb5ee54e9bce23826fa45b612db82a7a8205840 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -58,7 +58,7 @@ endif
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index a12fdde2a145e11465dab3441a07abff6f46b0e4..21db6ad17a9dd4a86d498110c3366a7e1dc5fdbc 100644 (file)
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -108,7 +108,7 @@ EXTRA_DIST = \
  test_peerstore_api_data.conf
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 0016b1b3bd6daab7cd1a72d85f633f7bffe9cb1c..a16128624ba481006c4c25ece53fd4a30ea49c89 100644 (file)
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -53,7 +53,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 30e2a9673a79c9be299751dd32c22815002dde7e..07c019e1da972522ed1b9cb724ca1059e171c74d 100644 (file)
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -118,7 +118,7 @@ endif
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/psycutil/Makefile.am b/src/psycutil/Makefile.am
index 2a916fe30a493133a7d521fa5a8583eb24f60a04..2732c3a21de2bcc452ec989087d525573472a279 100644 (file)
--- a/src/psycutil/Makefile.am
+++ b/src/psycutil/Makefile.am
@@ -33,7 +33,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index e56990f08adce783ebf7137da3f26c4d3a69b9fa..e36630ae44bdd4017826f7ea6b40337641de8d00 100644 (file)
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -82,7 +82,7 @@ endif
 check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 7f0fb707f47c5225079e96f88e15f63e61212404..70f612485a012566c1c9eec304708922cf693b91 100644 (file)
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -152,7 +152,7 @@ check_PROGRAMS = \
   test_regex_api
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index a681b2f3396b015e8f847f948d1468149acfdeda..541c7120d8685d2a34367e5e82ef496778c02c4f 100644 (file)
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -72,7 +72,7 @@ check_SCRIPTS = \
   test_local_revocation.py
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = \
  $(check_SCRIPTS) \
  $(check_PROGRAMS)

diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index eee1a91b9bde007fe7e627a30bd742ff405df974..de7f853c1d9a9d8cf76b9985902062a40b6efc0a 100644 (file)
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -96,7 +96,7 @@ rps_test_src = \
  gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index e2487d9f3821333da8544ed533c013806b257976..10e04284f188b72b316e8a40b44dc1f3a250890f 100644 (file)
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -106,7 +106,7 @@ check_PROGRAMS = \
   test_ecc_scalarproduct
 
 if ENABLE_TEST_RUN
-  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
   TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
 endif
 

diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 3d0c73c3baa18f2f71909067cd3d9de139d05afd..562688dd997a5ba764b86e051f06a2b045b2c1f1 100644 (file)
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -60,7 +60,7 @@ check_PROGRAMS = \
  test_secretsharing_api
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 4d990479cb51e750fae8e8c26705b50c103993b1..9d6b0d3c28f3bf50e60b5e2b070d86692fc761c6 100644 (file)
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -80,7 +80,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/social/Makefile.am b/src/social/Makefile.am
index 693a61411d982138bcc5dcc4d47f33c33b05b848..94a9ba108aae682b0c1a27938f0f5d347fbc74f8 100644 (file)
--- a/src/social/Makefile.am
+++ b/src/social/Makefile.am
@@ -62,7 +62,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 0907c4a37134fa6c87cceb74e6244d7aa176f38d..b2e256960efd6f0049cdb593771ab8b51fe75783 100644 (file)
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -55,7 +55,7 @@ check_PROGRAMS = \
  test_statistics_api_watch_zero_value
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 endif
 

diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index bdd5d6ebf4b013adddd1dcaf6878f93d7a798128..5a27a6d608962024b5ffdeff5e9be02db02e6152 100644 (file)
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -42,7 +42,7 @@ check_PROGRAMS = \
  test_template_api
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/testbed-logger/Makefile.am b/src/testbed-logger/Makefile.am
index 7f372fd022aab7d100a42d1d57fd37b90d63e31c..a8c4c7b0576870cc6378750ac7075a5e33fe59eb 100644 (file)
--- a/src/testbed-logger/Makefile.am
+++ b/src/testbed-logger/Makefile.am
@@ -41,7 +41,7 @@ check_PROGRAMS = \
   test_testbed_logger_api
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = \
   test_testbed_logger_api
 endif

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index e9b667b6cd84c9c5743c9f787fb98f34b0a531b1..94c9082950f9b49bf1bcaec28f2fb5d2dc11c28f 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -157,7 +157,7 @@ check_PROGRAMS = \
   $(underlay_testcases)
 
 if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
  TESTS = \
   test_testbed_api \
   test_testbed_api_sd \

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index c290dc9097ae4d2eb579ebe2cab24731aeb8badc..727bfb13415f2ac3868c450f3f9cdaeadf06d0a2 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -56,7 +56,7 @@ check_PROGRAMS = \
  test_testing_sharedservices
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  test_testing_portreservation \
  test_testing_peerstartup \

diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 6c6cbf8ff154d9f27dab70821c526480daa46677..97e4652d05ba59f4a5e1de3247a88c140beb9e4d 100644 (file)
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -48,7 +48,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 0b523eecc465eb82cea96da1c005d93314b694fa..acc2557c605b40d8b3554e8d798dc387a9820b29 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -500,7 +500,7 @@ endif
 endif
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  test_transport_address_switch_tcp \
  test_transport_address_switch_udp \

diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index d8eb2767ecc4f6a735b6d7c617af08dd07aa52ed..c741f5654d4de97cb038d5551e3c004c17b1d646 100644 (file)
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -28,7 +28,7 @@ check_PROGRAMS = \
  test_regex
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c666b017ddef08a390bcb3438e2e319b6aa198fb..931dd956803a32ebeb41634d5ddf46b426e7751a 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -187,7 +187,7 @@ noinst_PROGRAMS = \
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif