aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/Makefile.am2
-rw-r--r--src/arm/Makefile.am2
-rw-r--r--src/ats-tests/Makefile.am2
-rw-r--r--src/ats/Makefile.am2
-rw-r--r--src/consensus/Makefile.am2
-rw-r--r--src/conversation/Makefile.am2
-rw-r--r--src/core/Makefile.am2
-rw-r--r--src/datacache/Makefile.am2
-rw-r--r--src/datastore/Makefile.am2
-rw-r--r--src/dht/Makefile.am2
-rw-r--r--src/dns/Makefile.am2
-rw-r--r--src/dv/Makefile.am2
-rw-r--r--src/env/Makefile.am2
-rw-r--r--src/experimentation/Makefile.am2
-rw-r--r--src/fragmentation/Makefile.am2
-rw-r--r--src/fs/Makefile.am4
-rw-r--r--src/gns/Makefile.am2
-rw-r--r--src/gnsrecord/Makefile.am2
-rw-r--r--src/hello/Makefile.am2
-rw-r--r--src/hostlist/Makefile.am2
-rw-r--r--src/identity/Makefile.am2
-rw-r--r--src/integration-tests/Makefile.am2
-rw-r--r--src/mesh/Makefile.am2
-rw-r--r--src/multicast/Makefile.am2
-rw-r--r--src/namecache/Makefile.am2
-rw-r--r--src/namestore/Makefile.am2
-rw-r--r--src/nat/Makefile.am2
-rw-r--r--src/nse/Makefile.am2
-rw-r--r--src/peerinfo-tool/Makefile.am2
-rw-r--r--src/peerinfo/Makefile.am2
-rw-r--r--src/psyc/Makefile.am2
-rw-r--r--src/psycstore/Makefile.am2
-rw-r--r--src/pt/Makefile.am2
-rw-r--r--src/regex/Makefile.am2
-rw-r--r--src/revocation/Makefile.am2
-rw-r--r--src/scalarproduct/Makefile.am2
-rw-r--r--src/secretsharing/Makefile.am2
-rw-r--r--src/set/Makefile.am2
-rw-r--r--src/statistics/Makefile.am2
-rw-r--r--src/template/Makefile.am2
-rw-r--r--src/testbed/Makefile.am2
-rw-r--r--src/testing/Makefile.am2
-rw-r--r--src/topology/Makefile.am2
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/tun/Makefile.am2
-rw-r--r--src/util/Makefile.am2
46 files changed, 46 insertions, 48 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c8d301e67..f36922b20 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -83,7 +83,7 @@ check_PROGRAMS = \
83 test_gnunet_prefix 83 test_gnunet_prefix
84 84
85if ENABLE_TEST_RUN 85if ENABLE_TEST_RUN
86TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 86AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
87TESTS = $(check_PROGRAMS) 87TESTS = $(check_PROGRAMS)
88endif 88endif
89 89
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 238a463ec..a3ba06652 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -72,7 +72,7 @@ check_SCRIPTS = \
72endif 72endif
73 73
74if ENABLE_TEST_RUN 74if ENABLE_TEST_RUN
75TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 75AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
76TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 76TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
77endif 77endif
78 78
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 20b7784fe..532a738b9 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -45,7 +45,7 @@ check_PROGRAMS = \
45 $(TESTING_TESTS) 45 $(TESTING_TESTS)
46 46
47if ENABLE_TEST_RUN 47if ENABLE_TEST_RUN
48TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 48AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
49TESTS = $(check_PROGRAMS) 49TESTS = $(check_PROGRAMS)
50endif 50endif
51 51
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 8be619980..63a781abf 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -145,7 +145,7 @@ check_PROGRAMS = \
145 $(TESTING_TESTS) 145 $(TESTING_TESTS)
146 146
147if ENABLE_TEST_RUN 147if ENABLE_TEST_RUN
148TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 148AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
149TESTS = $(check_PROGRAMS) 149TESTS = $(check_PROGRAMS)
150endif 150endif
151 151
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index bd2c94d09..a6222b69c 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -77,7 +77,7 @@ check_PROGRAMS = \
77 test_consensus_api 77 test_consensus_api
78 78
79if ENABLE_TEST_RUN 79if ENABLE_TEST_RUN
80TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 80AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
81TESTS = $(check_PROGRAMS) 81TESTS = $(check_PROGRAMS)
82endif 82endif
83 83
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 04bf707e5..25c31c8e6 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -94,7 +94,7 @@ libexec_PROGRAMS += \
94 $(AUDIO_HELPER_RECD) \ 94 $(AUDIO_HELPER_RECD) \
95 $(AUDIO_HELPER_PLAY) 95 $(AUDIO_HELPER_PLAY)
96 96
97TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 97AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
98TESTS = $(AUDIO_TESTS) 98TESTS = $(AUDIO_TESTS)
99 99
100if BUILD_PULSE_HELPERS 100if BUILD_PULSE_HELPERS
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b013db6b3..17161af61 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -73,7 +73,7 @@ check_PROGRAMS = \
73 $(TESTING_TESTS) 73 $(TESTING_TESTS)
74 74
75if ENABLE_TEST_RUN 75if ENABLE_TEST_RUN
76TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 76AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
77TESTS = $(check_PROGRAMS) 77TESTS = $(check_PROGRAMS)
78endif 78endif
79 79
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index a66395772..7a89da852 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -122,7 +122,7 @@ check_PROGRAMS = \
122 $(POSTGRES_TESTS) 122 $(POSTGRES_TESTS)
123 123
124if ENABLE_TEST_RUN 124if ENABLE_TEST_RUN
125TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 125AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
126TESTS = $(check_PROGRAMS) 126TESTS = $(check_PROGRAMS)
127endif 127endif
128 128
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 2c0aec7a6..7044cb46a 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -170,7 +170,7 @@ check_PROGRAMS = \
170 $(POSTGRES_TESTS) 170 $(POSTGRES_TESTS)
171 171
172if ENABLE_TEST_RUN 172if ENABLE_TEST_RUN
173TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 173AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
174TESTS = $(check_PROGRAMS) 174TESTS = $(check_PROGRAMS)
175endif 175endif
176 176
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 2a4bb7d29..fd0cf1184 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -158,7 +158,7 @@ if HAVE_EXPERIMENTAL
158endif 158endif
159 159
160if ENABLE_TEST_RUN 160if ENABLE_TEST_RUN
161TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 161AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
162TESTS = test_dht_api $(check_SCRIPTS) \ 162TESTS = test_dht_api $(check_SCRIPTS) \
163 test_dht_twopeer \ 163 test_dht_twopeer \
164 test_dht_line \ 164 test_dht_line \
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 041fc67b2..0ef1623f9 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -115,7 +115,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \
115 115
116 116
117if ENABLE_TEST_RUN 117if ENABLE_TEST_RUN
118TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 118AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
119TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 119TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
120endif 120endif
121 121
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 37bd77046..db4e1f1d5 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -76,7 +76,7 @@ check_PROGRAMS = \
76endif 76endif
77 77
78if ENABLE_TEST_RUN 78if ENABLE_TEST_RUN
79 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 79 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
80 TESTS = $(check_PROGRAMS) 80 TESTS = $(check_PROGRAMS)
81endif 81endif
82 82
diff --git a/src/env/Makefile.am b/src/env/Makefile.am
index 4a79940b2..3a4c46cc9 100644
--- a/src/env/Makefile.am
+++ b/src/env/Makefile.am
@@ -32,7 +32,7 @@ check_PROGRAMS = \
32endif 32endif
33 33
34if ENABLE_TEST_RUN 34if ENABLE_TEST_RUN
35TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 35AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
36TESTS = $(check_PROGRAMS) 36TESTS = $(check_PROGRAMS)
37endif 37endif
38 38
diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index a1bc93722..26a467393 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -25,7 +25,7 @@ check_PROGRAMS = \
25 $(TEXT_EXP_CLIQUE) 25 $(TEXT_EXP_CLIQUE)
26 26
27if ENABLE_TEST_RUN 27if ENABLE_TEST_RUN
28 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 28 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
29 TESTS = \ 29 TESTS = \
30 $(TEXT_EXP_CLIQUE) 30 $(TEXT_EXP_CLIQUE)
31endif 31endif
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 9b7369aff..2497b5a07 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -25,7 +25,7 @@ check_PROGRAMS = \
25 test_fragmentation 25 test_fragmentation
26 26
27if ENABLE_TEST_RUN 27if ENABLE_TEST_RUN
28TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 28AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
29TESTS = $(check_PROGRAMS) 29TESTS = $(check_PROGRAMS)
30endif 30endif
31 31
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 79637e930..5ff341e1e 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -279,9 +279,7 @@ endif
279 279
280 280
281if ENABLE_TEST_RUN 281if ENABLE_TEST_RUN
282TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;\ 282AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY)
283 export PATH=@prefix@/bin:$$PATH;\
284 $(MONKEY)
285TESTS = \ 283TESTS = \
286 test_fs_directory \ 284 test_fs_directory \
287 test_fs_download \ 285 test_fs_download \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 226657e4f..4a3df78d9 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -277,7 +277,7 @@ check_SCRIPTS = \
277 277
278if ENABLE_TEST_RUN 278if ENABLE_TEST_RUN
279if HAVE_SQLITE 279if HAVE_SQLITE
280 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 280 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
281 TESTS = $(check_SCRIPTS) 281 TESTS = $(check_SCRIPTS)
282endif 282endif
283endif 283endif
diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am
index d0d8f3e89..2ac330ae0 100644
--- a/src/gnsrecord/Makefile.am
+++ b/src/gnsrecord/Makefile.am
@@ -21,7 +21,7 @@ check_PROGRAMS = \
21 test_gnsrecord_block_expiration 21 test_gnsrecord_block_expiration
22 22
23if ENABLE_TEST_RUN 23if ENABLE_TEST_RUN
24TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 24AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
25TESTS = \ 25TESTS = \
26 $(check_PROGRAMS) \ 26 $(check_PROGRAMS) \
27 $(check_SCRIPTS) 27 $(check_SCRIPTS)
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index 8f16219e8..7e5b9c451 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -28,7 +28,7 @@ check_PROGRAMS = \
28 test_friend_hello 28 test_friend_hello
29 29
30if ENABLE_TEST_RUN 30if ENABLE_TEST_RUN
31TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 31AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
32TESTS = $(check_PROGRAMS) 32TESTS = $(check_PROGRAMS)
33endif 33endif
34 34
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index b1c05596b..e647169c0 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -48,7 +48,7 @@ check_PROGRAMS = \
48 48
49if HAVE_MHD 49if HAVE_MHD
50if ENABLE_TEST_RUN 50if ENABLE_TEST_RUN
51TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 51AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
52TESTS = \ 52TESTS = \
53 test_gnunet_daemon_hostlist \ 53 test_gnunet_daemon_hostlist \
54 test_gnunet_daemon_hostlist_reconnect \ 54 test_gnunet_daemon_hostlist_reconnect \
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index b14ae57f8..b55817899 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -68,7 +68,7 @@ check_PROGRAMS = \
68endif 68endif
69 69
70if ENABLE_TEST_RUN 70if ENABLE_TEST_RUN
71TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 71AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
72TESTS = $(check_PROGRAMS) 72TESTS = $(check_PROGRAMS)
73endif 73endif
74 74
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 2bb97770c..74e7eed62 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -26,7 +26,7 @@ endif
26 26
27if HAVE_MHD 27if HAVE_MHD
28if ENABLE_TEST_RUN 28if ENABLE_TEST_RUN
29TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 29AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
30TESTS = \ 30TESTS = \
31 $(check_SCRIPTS) 31 $(check_SCRIPTS)
32endif 32endif
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 1dda635e3..1ca4c5a49 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -184,7 +184,7 @@ test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
184 184
185 185
186if ENABLE_TEST_RUN 186if ENABLE_TEST_RUN
187TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 187AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
188TESTS = \ 188TESTS = \
189 $(check_PROGRAMS) 189 $(check_PROGRAMS)
190endif 190endif
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 948575804..f8d49034e 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -51,7 +51,7 @@ check_PROGRAMS = \
51 test_multicast_api 51 test_multicast_api
52 52
53if ENABLE_TEST_RUN 53if ENABLE_TEST_RUN
54TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 54AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
55TESTS = $(check_PROGRAMS) 55TESTS = $(check_PROGRAMS)
56endif 56endif
57 57
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index c22c20085..921274593 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -47,7 +47,7 @@ check_PROGRAMS = \
47endif 47endif
48 48
49if ENABLE_TEST_RUN 49if ENABLE_TEST_RUN
50TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 50AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
51TESTS = \ 51TESTS = \
52 $(check_PROGRAMS) 52 $(check_PROGRAMS)
53endif 53endif
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index e97f74ee7..9089fa422 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -63,7 +63,7 @@ check_PROGRAMS = \
63endif 63endif
64 64
65if ENABLE_TEST_RUN 65if ENABLE_TEST_RUN
66TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 66AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
67TESTS = \ 67TESTS = \
68 $(check_PROGRAMS) \ 68 $(check_PROGRAMS) \
69 $(check_SCRIPTS) 69 $(check_SCRIPTS)
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 0111cd5b1..56feada35 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -80,7 +80,7 @@ check_PROGRAMS = \
80 test_nat_test 80 test_nat_test
81 81
82if ENABLE_TEST_RUN 82if ENABLE_TEST_RUN
83 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 83 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
84 TESTS = $(check_PROGRAMS) 84 TESTS = $(check_PROGRAMS)
85endif 85endif
86 86
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 513642423..6c6a9d8e0 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -80,7 +80,7 @@ check_PROGRAMS = \
80endif 80endif
81 81
82if ENABLE_TEST_RUN 82if ENABLE_TEST_RUN
83TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 83AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
84TESTS = $(check_PROGRAMS) 84TESTS = $(check_PROGRAMS)
85endif 85endif
86 86
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index bead00989..01c1f3473 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -29,7 +29,7 @@ check_SCRIPTS = \
29endif 29endif
30 30
31if ENABLE_TEST_RUN 31if ENABLE_TEST_RUN
32TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 32AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
33TESTS = $(check_SCRIPTS) 33TESTS = $(check_SCRIPTS)
34endif 34endif
35 35
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 054d5ce13..24d35c9a3 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -57,7 +57,7 @@ endif
57 57
58 58
59if ENABLE_TEST_RUN 59if ENABLE_TEST_RUN
60TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 60AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
61TESTS = $(check_PROGRAMS) 61TESTS = $(check_PROGRAMS)
62endif 62endif
63 63
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index d6901922f..7860b3995 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -59,7 +59,7 @@ check_PROGRAMS = \
59endif 59endif
60 60
61if ENABLE_TEST_RUN 61if ENABLE_TEST_RUN
62TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 62AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
63TESTS = $(check_PROGRAMS) 63TESTS = $(check_PROGRAMS)
64endif 64endif
65 65
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index d87cd25f0..e27113b81 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -81,7 +81,7 @@ check_PROGRAMS = \
81endif 81endif
82 82
83if ENABLE_TEST_RUN 83if ENABLE_TEST_RUN
84TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 84AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
85TESTS = $(check_PROGRAMS) 85TESTS = $(check_PROGRAMS)
86endif 86endif
87 87
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 816484377..2f821288a 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -57,7 +57,7 @@ endif
57check_PROGRAMS = $(VPN_TEST) 57check_PROGRAMS = $(VPN_TEST)
58 58
59if ENABLE_TEST_RUN 59if ENABLE_TEST_RUN
60TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 60AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
61TESTS = $(check_PROGRAMS) 61TESTS = $(check_PROGRAMS)
62endif 62endif
63 63
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 90b9df7e4..bf7c34dcb 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -170,7 +170,7 @@ check_PROGRAMS = \
170 test_regex_api 170 test_regex_api
171 171
172if ENABLE_TEST_RUN 172if ENABLE_TEST_RUN
173 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 173 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
174 TESTS = $(check_PROGRAMS) 174 TESTS = $(check_PROGRAMS)
175endif 175endif
176 176
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 14cc11494..a6d584006 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -74,7 +74,7 @@ check_SCRIPTS = \
74 test_local_revocation.py 74 test_local_revocation.py
75 75
76if ENABLE_TEST_RUN 76if ENABLE_TEST_RUN
77 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 77 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
78 TESTS = \ 78 TESTS = \
79 $(check_SCRIPTS) \ 79 $(check_SCRIPTS) \
80 $(check_PROGRAMS) 80 $(check_PROGRAMS)
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 010d7ebfa..0f838a7f9 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -67,6 +67,6 @@ check_SCRIPTS = \
67 test_scalarproduct_negativezero.sh 67 test_scalarproduct_negativezero.sh
68 68
69if ENABLE_TEST_RUN 69if ENABLE_TEST_RUN
70 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 70 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
71 TESTS = $(check_SCRIPTS) 71 TESTS = $(check_SCRIPTS)
72endif 72endif
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index fb519f4b1..3404a259c 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -63,7 +63,7 @@ check_PROGRAMS = \
63 test_secretsharing_api 63 test_secretsharing_api
64 64
65if ENABLE_TEST_RUN 65if ENABLE_TEST_RUN
66TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 66AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
67TESTS = $(check_PROGRAMS) 67TESTS = $(check_PROGRAMS)
68endif 68endif
69 69
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 32eb3317c..8d3fe62b9 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -70,7 +70,7 @@ check_PROGRAMS = \
70endif 70endif
71 71
72if ENABLE_TEST_RUN 72if ENABLE_TEST_RUN
73TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 73AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
74TESTS = $(check_PROGRAMS) 74TESTS = $(check_PROGRAMS)
75endif 75endif
76 76
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 991a6156f..b5e975740 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -58,7 +58,7 @@ check_PROGRAMS = \
58 test_statistics_api_watch_zero_value 58 test_statistics_api_watch_zero_value
59 59
60if ENABLE_TEST_RUN 60if ENABLE_TEST_RUN
61TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 61AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
62TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 62TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
63endif 63endif
64 64
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index 42d6a95a0..4df4eb484 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -38,7 +38,7 @@ check_PROGRAMS = \
38 test_template_api 38 test_template_api
39 39
40if ENABLE_TEST_RUN 40if ENABLE_TEST_RUN
41TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 41AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
42TESTS = $(check_PROGRAMS) 42TESTS = $(check_PROGRAMS)
43endif 43endif
44 44
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index e9e537515..b3a8260c4 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -193,7 +193,7 @@ check_PROGRAMS = \
193 $(underlay_testcases) 193 $(underlay_testcases)
194 194
195if ENABLE_TEST_RUN 195if ENABLE_TEST_RUN
196 TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 196 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
197 TESTS = \ 197 TESTS = \
198 test_testbed_api \ 198 test_testbed_api \
199 test_testbed_logger_api \ 199 test_testbed_logger_api \
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 6b229b6fe..899708102 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -57,7 +57,7 @@ check_PROGRAMS = \
57 test_testing_sharedservices 57 test_testing_sharedservices
58 58
59if ENABLE_TEST_RUN 59if ENABLE_TEST_RUN
60TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 60AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
61TESTS = \ 61TESTS = \
62 test_testing_portreservation \ 62 test_testing_portreservation \
63 test_testing_peerstartup \ 63 test_testing_peerstartup \
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index b8b534a0a..97bc28bd2 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -46,7 +46,7 @@ check_PROGRAMS = \
46endif 46endif
47 47
48if ENABLE_TEST_RUN 48if ENABLE_TEST_RUN
49TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 49AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
50TESTS = $(check_PROGRAMS) 50TESTS = $(check_PROGRAMS)
51endif 51endif
52 52
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index bbd811bb8..2f30a212a 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -440,7 +440,7 @@ check_PROGRAMS = \
440endif 440endif
441 441
442if ENABLE_TEST_RUN 442if ENABLE_TEST_RUN
443TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 443AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
444TESTS = \ 444TESTS = \
445 test_transport_testing_startstop \ 445 test_transport_testing_startstop \
446 test_transport_testing_restart \ 446 test_transport_testing_restart \
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index ffe58136f..1b42e53ec 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -27,7 +27,7 @@ check_PROGRAMS = \
27 test_regex 27 test_regex
28 28
29if ENABLE_TEST_RUN 29if ENABLE_TEST_RUN
30TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 30AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
31TESTS = $(check_PROGRAMS) 31TESTS = $(check_PROGRAMS)
32endif 32endif
33 33
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index f520d1cb4..41f5a599b 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -279,7 +279,7 @@ check_PROGRAMS = \
279 test_common_logging_runtime_loglevels 279 test_common_logging_runtime_loglevels
280 280
281if ENABLE_TEST_RUN 281if ENABLE_TEST_RUN
282TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 282AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
283TESTS = $(check_PROGRAMS) 283TESTS = $(check_PROGRAMS)
284endif 284endif
285 285