diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2014-01-24 17:25:00 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2014-01-24 17:25:00 +0000 |
commit | 8a741e7ef0f3eefbcb8eb990b47df699132b3873 (patch) | |
tree | fb8c32d060818553ebf4093c1b704e63df017e89 /src | |
parent | f82ac0f3dd7f6da49cef39afee98ef5a9ec36b3f (diff) | |
download | gnunet-8a741e7ef0f3eefbcb8eb990b47df699132b3873.tar.gz gnunet-8a741e7ef0f3eefbcb8eb990b47df699132b3873.zip |
fix #3275 with solution from https://gnunet.org/bugs/view.php?id=3275#c8029
sed -i 's#^\(\s*\)TESTS#\1TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;\n&#'
Diffstat (limited to 'src')
45 files changed, 48 insertions, 1 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index e122efe99..7b022fe5d 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am | |||
@@ -72,6 +72,7 @@ check_SCRIPTS = \ | |||
72 | endif | 72 | endif |
73 | 73 | ||
74 | if ENABLE_TEST_RUN | 74 | if ENABLE_TEST_RUN |
75 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
75 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 76 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
76 | endif | 77 | endif |
77 | 78 | ||
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 21916ccc0..bda1eb999 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -45,6 +45,7 @@ check_PROGRAMS = \ | |||
45 | $(TESTING_TESTS) | 45 | $(TESTING_TESTS) |
46 | 46 | ||
47 | if ENABLE_TEST_RUN | 47 | if ENABLE_TEST_RUN |
48 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
48 | TESTS = $(check_PROGRAMS) | 49 | TESTS = $(check_PROGRAMS) |
49 | endif | 50 | endif |
50 | 51 | ||
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index ab20b6dac..2e4e1651e 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -145,6 +145,7 @@ check_PROGRAMS = \ | |||
145 | $(TESTING_TESTS) | 145 | $(TESTING_TESTS) |
146 | 146 | ||
147 | if ENABLE_TEST_RUN | 147 | if ENABLE_TEST_RUN |
148 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
148 | TESTS = $(check_PROGRAMS) | 149 | TESTS = $(check_PROGRAMS) |
149 | endif | 150 | endif |
150 | 151 | ||
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am index ac57ce2dc..b14be5681 100644 --- a/src/consensus/Makefile.am +++ b/src/consensus/Makefile.am | |||
@@ -77,6 +77,7 @@ check_PROGRAMS = \ | |||
77 | test_consensus_api | 77 | test_consensus_api |
78 | 78 | ||
79 | if ENABLE_TEST_RUN | 79 | if ENABLE_TEST_RUN |
80 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
80 | TESTS = $(check_PROGRAMS) | 81 | TESTS = $(check_PROGRAMS) |
81 | endif | 82 | endif |
82 | 83 | ||
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 37cf5c85f..af3b96655 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -94,6 +94,7 @@ libexec_PROGRAMS += \ | |||
94 | $(AUDIO_HELPER_RECD) \ | 94 | $(AUDIO_HELPER_RECD) \ |
95 | $(AUDIO_HELPER_PLAY) | 95 | $(AUDIO_HELPER_PLAY) |
96 | 96 | ||
97 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
97 | TESTS = $(AUDIO_TESTS) | 98 | TESTS = $(AUDIO_TESTS) |
98 | 99 | ||
99 | if BUILD_PULSE_HELPERS | 100 | if BUILD_PULSE_HELPERS |
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 9a68925b2..8d9faf2c7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -73,6 +73,7 @@ check_PROGRAMS = \ | |||
73 | $(TESTING_TESTS) | 73 | $(TESTING_TESTS) |
74 | 74 | ||
75 | if ENABLE_TEST_RUN | 75 | if ENABLE_TEST_RUN |
76 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
76 | TESTS = $(check_PROGRAMS) | 77 | TESTS = $(check_PROGRAMS) |
77 | endif | 78 | endif |
78 | 79 | ||
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 97ffabb87..f9af4610b 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -122,6 +122,7 @@ check_PROGRAMS = \ | |||
122 | $(POSTGRES_TESTS) | 122 | $(POSTGRES_TESTS) |
123 | 123 | ||
124 | if ENABLE_TEST_RUN | 124 | if ENABLE_TEST_RUN |
125 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
125 | TESTS = $(check_PROGRAMS) | 126 | TESTS = $(check_PROGRAMS) |
126 | endif | 127 | endif |
127 | 128 | ||
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 5522b0295..092f0ede5 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -170,6 +170,7 @@ check_PROGRAMS = \ | |||
170 | $(POSTGRES_TESTS) | 170 | $(POSTGRES_TESTS) |
171 | 171 | ||
172 | if ENABLE_TEST_RUN | 172 | if ENABLE_TEST_RUN |
173 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
173 | TESTS = $(check_PROGRAMS) | 174 | TESTS = $(check_PROGRAMS) |
174 | endif | 175 | endif |
175 | 176 | ||
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index dcfb20166..f35e1e18c 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -158,6 +158,7 @@ if HAVE_EXPERIMENTAL | |||
158 | endif | 158 | endif |
159 | 159 | ||
160 | if ENABLE_TEST_RUN | 160 | if ENABLE_TEST_RUN |
161 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
161 | TESTS = test_dht_api $(check_SCRIPTS) \ | 162 | TESTS = test_dht_api $(check_SCRIPTS) \ |
162 | test_dht_twopeer \ | 163 | test_dht_twopeer \ |
163 | test_dht_line \ | 164 | test_dht_line \ |
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 8b94a3bf6..c2a432ca6 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -115,6 +115,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \ | |||
115 | 115 | ||
116 | 116 | ||
117 | if ENABLE_TEST_RUN | 117 | if ENABLE_TEST_RUN |
118 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
118 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 119 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
119 | endif | 120 | endif |
120 | 121 | ||
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 447f64022..a4b1c4b04 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am | |||
@@ -76,6 +76,7 @@ check_PROGRAMS = \ | |||
76 | endif | 76 | endif |
77 | 77 | ||
78 | if ENABLE_TEST_RUN | 78 | if ENABLE_TEST_RUN |
79 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
79 | TESTS = $(check_PROGRAMS) | 80 | TESTS = $(check_PROGRAMS) |
80 | endif | 81 | endif |
81 | 82 | ||
diff --git a/src/env/Makefile.am b/src/env/Makefile.am index 67e9c6425..c3f2aee02 100644 --- a/src/env/Makefile.am +++ b/src/env/Makefile.am | |||
@@ -32,6 +32,7 @@ check_PROGRAMS = \ | |||
32 | endif | 32 | endif |
33 | 33 | ||
34 | if ENABLE_TEST_RUN | 34 | if ENABLE_TEST_RUN |
35 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
35 | TESTS = $(check_PROGRAMS) | 36 | TESTS = $(check_PROGRAMS) |
36 | endif | 37 | endif |
37 | 38 | ||
diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am index 5935d9388..0c6a96936 100644 --- a/src/experimentation/Makefile.am +++ b/src/experimentation/Makefile.am | |||
@@ -25,6 +25,7 @@ check_PROGRAMS = \ | |||
25 | $(TEXT_EXP_CLIQUE) | 25 | $(TEXT_EXP_CLIQUE) |
26 | 26 | ||
27 | if ENABLE_TEST_RUN | 27 | if ENABLE_TEST_RUN |
28 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
28 | TESTS = \ | 29 | TESTS = \ |
29 | $(TEXT_EXP_CLIQUE) | 30 | $(TEXT_EXP_CLIQUE) |
30 | endif | 31 | endif |
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am index 138b7ea6a..d85373a10 100644 --- a/src/fragmentation/Makefile.am +++ b/src/fragmentation/Makefile.am | |||
@@ -25,6 +25,7 @@ check_PROGRAMS = \ | |||
25 | test_fragmentation | 25 | test_fragmentation |
26 | 26 | ||
27 | if ENABLE_TEST_RUN | 27 | if ENABLE_TEST_RUN |
28 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
28 | TESTS = $(check_PROGRAMS) | 29 | TESTS = $(check_PROGRAMS) |
29 | endif | 30 | endif |
30 | 31 | ||
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index c892bb47e..a04591ab2 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -273,12 +273,15 @@ check_SCRIPTS = \ | |||
273 | endif | 273 | endif |
274 | 274 | ||
275 | if ENABLE_MONKEY | 275 | if ENABLE_MONKEY |
276 | TESTS_ENVIRONMENT = @MONKEYPREFIX@ | 276 | MONKEY = @MONKEYPREFIX@ |
277 | AM_LDFLAGS = -no-install | 277 | AM_LDFLAGS = -no-install |
278 | endif | 278 | endif |
279 | 279 | ||
280 | 280 | ||
281 | if ENABLE_TEST_RUN | 281 | if ENABLE_TEST_RUN |
282 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;\ | ||
283 | export PATH=@prefix@/bin:$$PATH;\ | ||
284 | $(MONKEY) | ||
282 | TESTS = \ | 285 | TESTS = \ |
283 | test_fs_directory \ | 286 | test_fs_directory \ |
284 | test_fs_download \ | 287 | test_fs_download \ |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 3b39755a4..41c9032f0 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -277,6 +277,7 @@ check_SCRIPTS = \ | |||
277 | 277 | ||
278 | if ENABLE_TEST_RUN | 278 | if ENABLE_TEST_RUN |
279 | if HAVE_SQLITE | 279 | if HAVE_SQLITE |
280 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
280 | TESTS = $(check_SCRIPTS) | 281 | TESTS = $(check_SCRIPTS) |
281 | endif | 282 | endif |
282 | endif | 283 | endif |
diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am index 2c9d2f476..a5a698e2f 100644 --- a/src/gnsrecord/Makefile.am +++ b/src/gnsrecord/Makefile.am | |||
@@ -21,6 +21,7 @@ check_PROGRAMS = \ | |||
21 | test_gnsrecord_block_expiration | 21 | test_gnsrecord_block_expiration |
22 | 22 | ||
23 | if ENABLE_TEST_RUN | 23 | if ENABLE_TEST_RUN |
24 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
24 | TESTS = \ | 25 | TESTS = \ |
25 | $(check_PROGRAMS) \ | 26 | $(check_PROGRAMS) \ |
26 | $(check_SCRIPTS) | 27 | $(check_SCRIPTS) |
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index ab25538ac..328a88a48 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am | |||
@@ -28,6 +28,7 @@ check_PROGRAMS = \ | |||
28 | test_friend_hello | 28 | test_friend_hello |
29 | 29 | ||
30 | if ENABLE_TEST_RUN | 30 | if ENABLE_TEST_RUN |
31 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
31 | TESTS = $(check_PROGRAMS) | 32 | TESTS = $(check_PROGRAMS) |
32 | endif | 33 | endif |
33 | 34 | ||
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index c31f28c26..887355d9b 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -48,6 +48,7 @@ check_PROGRAMS = \ | |||
48 | 48 | ||
49 | if HAVE_MHD | 49 | if HAVE_MHD |
50 | if ENABLE_TEST_RUN | 50 | if ENABLE_TEST_RUN |
51 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
51 | TESTS = \ | 52 | TESTS = \ |
52 | test_gnunet_daemon_hostlist \ | 53 | test_gnunet_daemon_hostlist \ |
53 | test_gnunet_daemon_hostlist_reconnect \ | 54 | test_gnunet_daemon_hostlist_reconnect \ |
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index e01a47974..616f0b5b0 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am | |||
@@ -68,6 +68,7 @@ check_PROGRAMS = \ | |||
68 | endif | 68 | endif |
69 | 69 | ||
70 | if ENABLE_TEST_RUN | 70 | if ENABLE_TEST_RUN |
71 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
71 | TESTS = $(check_PROGRAMS) | 72 | TESTS = $(check_PROGRAMS) |
72 | endif | 73 | endif |
73 | 74 | ||
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 080b8754b..2a106d381 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -26,6 +26,7 @@ endif | |||
26 | 26 | ||
27 | if HAVE_MHD | 27 | if HAVE_MHD |
28 | if ENABLE_TEST_RUN | 28 | if ENABLE_TEST_RUN |
29 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
29 | TESTS = \ | 30 | TESTS = \ |
30 | $(check_SCRIPTS) | 31 | $(check_SCRIPTS) |
31 | endif | 32 | endif |
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index c8e39ffc8..455d45a46 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am | |||
@@ -184,6 +184,7 @@ test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib) | |||
184 | 184 | ||
185 | 185 | ||
186 | if ENABLE_TEST_RUN | 186 | if ENABLE_TEST_RUN |
187 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
187 | TESTS = \ | 188 | TESTS = \ |
188 | $(check_PROGRAMS) | 189 | $(check_PROGRAMS) |
189 | endif | 190 | endif |
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 5035c3f79..b65bd65cd 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am | |||
@@ -51,6 +51,7 @@ check_PROGRAMS = \ | |||
51 | test_multicast_api | 51 | test_multicast_api |
52 | 52 | ||
53 | if ENABLE_TEST_RUN | 53 | if ENABLE_TEST_RUN |
54 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
54 | TESTS = $(check_PROGRAMS) | 55 | TESTS = $(check_PROGRAMS) |
55 | endif | 56 | endif |
56 | 57 | ||
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index 8203a19be..41c27e413 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am | |||
@@ -47,6 +47,7 @@ check_PROGRAMS = \ | |||
47 | endif | 47 | endif |
48 | 48 | ||
49 | if ENABLE_TEST_RUN | 49 | if ENABLE_TEST_RUN |
50 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
50 | TESTS = \ | 51 | TESTS = \ |
51 | $(check_PROGRAMS) | 52 | $(check_PROGRAMS) |
52 | endif | 53 | endif |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 91bc3d5ef..32d29ebca 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -63,6 +63,7 @@ check_PROGRAMS = \ | |||
63 | endif | 63 | endif |
64 | 64 | ||
65 | if ENABLE_TEST_RUN | 65 | if ENABLE_TEST_RUN |
66 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
66 | TESTS = \ | 67 | TESTS = \ |
67 | $(check_PROGRAMS) \ | 68 | $(check_PROGRAMS) \ |
68 | $(check_SCRIPTS) | 69 | $(check_SCRIPTS) |
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index e5630519c..a7424b8dc 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -80,6 +80,7 @@ check_PROGRAMS = \ | |||
80 | test_nat_test | 80 | test_nat_test |
81 | 81 | ||
82 | if ENABLE_TEST_RUN | 82 | if ENABLE_TEST_RUN |
83 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
83 | TESTS = $(check_PROGRAMS) | 84 | TESTS = $(check_PROGRAMS) |
84 | endif | 85 | endif |
85 | 86 | ||
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index b60d38d80..44c187739 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am | |||
@@ -80,6 +80,7 @@ check_PROGRAMS = \ | |||
80 | endif | 80 | endif |
81 | 81 | ||
82 | if ENABLE_TEST_RUN | 82 | if ENABLE_TEST_RUN |
83 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
83 | TESTS = $(check_PROGRAMS) | 84 | TESTS = $(check_PROGRAMS) |
84 | endif | 85 | endif |
85 | 86 | ||
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 2309a47e2..1bca57678 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -29,6 +29,7 @@ check_SCRIPTS = \ | |||
29 | endif | 29 | endif |
30 | 30 | ||
31 | if ENABLE_TEST_RUN | 31 | if ENABLE_TEST_RUN |
32 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
32 | TESTS = $(check_SCRIPTS) | 33 | TESTS = $(check_SCRIPTS) |
33 | endif | 34 | endif |
34 | 35 | ||
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 457b674b3..7dd1581c4 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -57,6 +57,7 @@ endif | |||
57 | 57 | ||
58 | 58 | ||
59 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
60 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
60 | TESTS = $(check_PROGRAMS) | 61 | TESTS = $(check_PROGRAMS) |
61 | endif | 62 | endif |
62 | 63 | ||
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am index 96f86ca92..d199bd3a2 100644 --- a/src/psyc/Makefile.am +++ b/src/psyc/Makefile.am | |||
@@ -59,6 +59,7 @@ check_PROGRAMS = \ | |||
59 | endif | 59 | endif |
60 | 60 | ||
61 | if ENABLE_TEST_RUN | 61 | if ENABLE_TEST_RUN |
62 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
62 | TESTS = $(check_PROGRAMS) | 63 | TESTS = $(check_PROGRAMS) |
63 | endif | 64 | endif |
64 | 65 | ||
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am index 40cd3ce6d..44ac5bb49 100644 --- a/src/psycstore/Makefile.am +++ b/src/psycstore/Makefile.am | |||
@@ -81,6 +81,7 @@ check_PROGRAMS = \ | |||
81 | endif | 81 | endif |
82 | 82 | ||
83 | if ENABLE_TEST_RUN | 83 | if ENABLE_TEST_RUN |
84 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
84 | TESTS = $(check_PROGRAMS) | 85 | TESTS = $(check_PROGRAMS) |
85 | endif | 86 | endif |
86 | 87 | ||
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 2bec16329..ebd662851 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -57,6 +57,7 @@ endif | |||
57 | check_PROGRAMS = $(VPN_TEST) | 57 | check_PROGRAMS = $(VPN_TEST) |
58 | 58 | ||
59 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
60 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
60 | TESTS = $(check_PROGRAMS) | 61 | TESTS = $(check_PROGRAMS) |
61 | endif | 62 | endif |
62 | 63 | ||
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 8f9f9edb9..dd02afa19 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -170,6 +170,7 @@ check_PROGRAMS = \ | |||
170 | test_regex_api | 170 | test_regex_api |
171 | 171 | ||
172 | if ENABLE_TEST_RUN | 172 | if ENABLE_TEST_RUN |
173 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
173 | TESTS = $(check_PROGRAMS) | 174 | TESTS = $(check_PROGRAMS) |
174 | endif | 175 | endif |
175 | 176 | ||
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index 18d379b0b..c1aef65cb 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am | |||
@@ -74,6 +74,7 @@ check_SCRIPTS = \ | |||
74 | test_local_revocation.py | 74 | test_local_revocation.py |
75 | 75 | ||
76 | if ENABLE_TEST_RUN | 76 | if ENABLE_TEST_RUN |
77 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
77 | TESTS = \ | 78 | TESTS = \ |
78 | $(check_SCRIPTS) \ | 79 | $(check_SCRIPTS) \ |
79 | $(check_PROGRAMS) | 80 | $(check_PROGRAMS) |
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am index 0bdc76e3e..b167bacb1 100644 --- a/src/scalarproduct/Makefile.am +++ b/src/scalarproduct/Makefile.am | |||
@@ -67,5 +67,6 @@ check_SCRIPTS = \ | |||
67 | test_scalarproduct_negativezero.sh | 67 | test_scalarproduct_negativezero.sh |
68 | 68 | ||
69 | if ENABLE_TEST_RUN | 69 | if ENABLE_TEST_RUN |
70 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
70 | TESTS = $(check_SCRIPTS) | 71 | TESTS = $(check_SCRIPTS) |
71 | endif | 72 | endif |
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am index b875953ba..556356b6f 100644 --- a/src/secretsharing/Makefile.am +++ b/src/secretsharing/Makefile.am | |||
@@ -63,6 +63,7 @@ check_PROGRAMS = \ | |||
63 | test_secretsharing_api | 63 | test_secretsharing_api |
64 | 64 | ||
65 | if ENABLE_TEST_RUN | 65 | if ENABLE_TEST_RUN |
66 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
66 | TESTS = $(check_PROGRAMS) | 67 | TESTS = $(check_PROGRAMS) |
67 | endif | 68 | endif |
68 | 69 | ||
diff --git a/src/set/Makefile.am b/src/set/Makefile.am index 124818ce4..a2bbab9a6 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am | |||
@@ -70,6 +70,7 @@ check_PROGRAMS = \ | |||
70 | endif | 70 | endif |
71 | 71 | ||
72 | if ENABLE_TEST_RUN | 72 | if ENABLE_TEST_RUN |
73 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
73 | TESTS = $(check_PROGRAMS) | 74 | TESTS = $(check_PROGRAMS) |
74 | endif | 75 | endif |
75 | 76 | ||
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 30d01661d..3baea5580 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am | |||
@@ -58,6 +58,7 @@ check_PROGRAMS = \ | |||
58 | test_statistics_api_watch_zero_value | 58 | test_statistics_api_watch_zero_value |
59 | 59 | ||
60 | if ENABLE_TEST_RUN | 60 | if ENABLE_TEST_RUN |
61 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
61 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 62 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
62 | endif | 63 | endif |
63 | 64 | ||
diff --git a/src/template/Makefile.am b/src/template/Makefile.am index 275cf2ff8..8d8acccea 100644 --- a/src/template/Makefile.am +++ b/src/template/Makefile.am | |||
@@ -38,6 +38,7 @@ check_PROGRAMS = \ | |||
38 | test_template_api | 38 | test_template_api |
39 | 39 | ||
40 | if ENABLE_TEST_RUN | 40 | if ENABLE_TEST_RUN |
41 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
41 | TESTS = $(check_PROGRAMS) | 42 | TESTS = $(check_PROGRAMS) |
42 | endif | 43 | endif |
43 | 44 | ||
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 532f4ea08..209894be7 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -193,6 +193,7 @@ check_PROGRAMS = \ | |||
193 | $(underlay_testcases) | 193 | $(underlay_testcases) |
194 | 194 | ||
195 | if ENABLE_TEST_RUN | 195 | if ENABLE_TEST_RUN |
196 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
196 | TESTS = \ | 197 | TESTS = \ |
197 | test_testbed_api \ | 198 | test_testbed_api \ |
198 | test_testbed_logger_api \ | 199 | test_testbed_logger_api \ |
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 8657d42cb..c1b41c265 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -57,6 +57,7 @@ check_PROGRAMS = \ | |||
57 | test_testing_sharedservices | 57 | test_testing_sharedservices |
58 | 58 | ||
59 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
60 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
60 | TESTS = \ | 61 | TESTS = \ |
61 | test_testing_portreservation \ | 62 | test_testing_portreservation \ |
62 | test_testing_peerstartup \ | 63 | test_testing_peerstartup \ |
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 09a2766d9..4f354a141 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -46,6 +46,7 @@ check_PROGRAMS = \ | |||
46 | endif | 46 | endif |
47 | 47 | ||
48 | if ENABLE_TEST_RUN | 48 | if ENABLE_TEST_RUN |
49 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
49 | TESTS = $(check_PROGRAMS) | 50 | TESTS = $(check_PROGRAMS) |
50 | endif | 51 | endif |
51 | 52 | ||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index acfaa9403..699899b2b 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -440,6 +440,7 @@ check_PROGRAMS = \ | |||
440 | endif | 440 | endif |
441 | 441 | ||
442 | if ENABLE_TEST_RUN | 442 | if ENABLE_TEST_RUN |
443 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
443 | TESTS = \ | 444 | TESTS = \ |
444 | test_transport_testing_startstop \ | 445 | test_transport_testing_startstop \ |
445 | test_transport_testing_restart \ | 446 | test_transport_testing_restart \ |
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am index f090266a9..a27d192cb 100644 --- a/src/tun/Makefile.am +++ b/src/tun/Makefile.am | |||
@@ -27,6 +27,7 @@ check_PROGRAMS = \ | |||
27 | test_regex | 27 | test_regex |
28 | 28 | ||
29 | if ENABLE_TEST_RUN | 29 | if ENABLE_TEST_RUN |
30 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
30 | TESTS = $(check_PROGRAMS) | 31 | TESTS = $(check_PROGRAMS) |
31 | endif | 32 | endif |
32 | 33 | ||
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index dd85f2c09..acebb39da 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -279,6 +279,7 @@ check_PROGRAMS = \ | |||
279 | test_common_logging_runtime_loglevels | 279 | test_common_logging_runtime_loglevels |
280 | 280 | ||
281 | if ENABLE_TEST_RUN | 281 | if ENABLE_TEST_RUN |
282 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH; | ||
282 | TESTS = $(check_PROGRAMS) | 283 | TESTS = $(check_PROGRAMS) |
283 | endif | 284 | endif |
284 | 285 | ||