diff options
46 files changed, 46 insertions, 48 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c8d301e67e..f36922b202 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -83,7 +83,7 @@ check_PROGRAMS = \ test_gnunet_prefix if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 238a463ec4..a3ba06652e 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -72,7 +72,7 @@ check_SCRIPTS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) $(check_SCRIPTS) endif diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 20b7784fe3..532a738b90 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -45,7 +45,7 @@ check_PROGRAMS = \ $(TESTING_TESTS) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 8be6199804..63a781abf8 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -145,7 +145,7 @@ check_PROGRAMS = \ $(TESTING_TESTS) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am index bd2c94d094..a6222b69c5 100644 --- a/src/consensus/Makefile.am +++ b/src/consensus/Makefile.am @@ -77,7 +77,7 @@ check_PROGRAMS = \ test_consensus_api if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 04bf707e54..25c31c8e6e 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am @@ -94,7 +94,7 @@ libexec_PROGRAMS += \ $(AUDIO_HELPER_RECD) \ $(AUDIO_HELPER_PLAY) -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(AUDIO_TESTS) if BUILD_PULSE_HELPERS diff --git a/src/core/Makefile.am b/src/core/Makefile.am index b013db6b32..17161af619 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -73,7 +73,7 @@ check_PROGRAMS = \ $(TESTING_TESTS) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index a663957729..7a89da8528 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am @@ -122,7 +122,7 @@ check_PROGRAMS = \ $(POSTGRES_TESTS) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 2c0aec7a67..7044cb46af 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am @@ -170,7 +170,7 @@ check_PROGRAMS = \ $(POSTGRES_TESTS) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 2a4bb7d292..fd0cf11847 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -158,7 +158,7 @@ if HAVE_EXPERIMENTAL endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; 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 041fc67b28..0ef1623f9f 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -115,7 +115,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \ if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) $(check_SCRIPTS) endif diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 37bd770462..db4e1f1d50 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am @@ -76,7 +76,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/env/Makefile.am b/src/env/Makefile.am index 4a79940b2d..3a4c46cc9b 100644 --- a/src/env/Makefile.am +++ b/src/env/Makefile.am @@ -32,7 +32,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am index a1bc93722f..26a4673934 100644 --- a/src/experimentation/Makefile.am +++ b/src/experimentation/Makefile.am @@ -25,7 +25,7 @@ check_PROGRAMS = \ $(TEXT_EXP_CLIQUE) if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(TEXT_EXP_CLIQUE) endif diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am index 9b7369aff5..2497b5a078 100644 --- a/src/fragmentation/Makefile.am +++ b/src/fragmentation/Makefile.am @@ -25,7 +25,7 @@ check_PROGRAMS = \ test_fragmentation if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 79637e9301..5ff341e1e7 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -279,9 +279,7 @@ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;\ - export PATH=@prefix@/bin:$$PATH;\ - $(MONKEY) +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY) TESTS = \ test_fs_directory \ test_fs_download \ diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 226657e4fe..4a3df78d9e 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -277,7 +277,7 @@ check_SCRIPTS = \ if ENABLE_TEST_RUN if HAVE_SQLITE - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_SCRIPTS) endif endif diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am index d0d8f3e894..2ac330ae08 100644 --- a/src/gnsrecord/Makefile.am +++ b/src/gnsrecord/Makefile.am @@ -21,7 +21,7 @@ check_PROGRAMS = \ test_gnsrecord_block_expiration if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_PROGRAMS) \ $(check_SCRIPTS) diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index 8f16219e80..7e5b9c451f 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am @@ -28,7 +28,7 @@ check_PROGRAMS = \ test_friend_hello if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index b1c05596bb..e647169c09 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -48,7 +48,7 @@ check_PROGRAMS = \ if HAVE_MHD if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_gnunet_daemon_hostlist \ test_gnunet_daemon_hostlist_reconnect \ diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index b14ae57f8d..b558178999 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am @@ -68,7 +68,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 2bb97770c1..74e7eed625 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -26,7 +26,7 @@ endif if HAVE_MHD if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_SCRIPTS) endif diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 1dda635e3c..1ca4c5a494 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) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_PROGRAMS) endif diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 9485758043..f8d49034e0 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -51,7 +51,7 @@ check_PROGRAMS = \ test_multicast_api if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index c22c200858..9212745931 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am @@ -47,7 +47,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_PROGRAMS) endif diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index e97f74ee78..9089fa4225 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -63,7 +63,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_PROGRAMS) \ $(check_SCRIPTS) diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 0111cd5b16..56feada358 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -80,7 +80,7 @@ check_PROGRAMS = \ test_nat_test if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 5136424233..6c6a9d8e0c 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -80,7 +80,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index bead00989d..01c1f3473c 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am @@ -29,7 +29,7 @@ check_SCRIPTS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_SCRIPTS) endif diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 054d5ce132..24d35c9a37 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -57,7 +57,7 @@ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am index d6901922f6..7860b39958 100644 --- a/src/psyc/Makefile.am +++ b/src/psyc/Makefile.am @@ -59,7 +59,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am index d87cd25f07..e27113b815 100644 --- a/src/psycstore/Makefile.am +++ b/src/psycstore/Makefile.am @@ -81,7 +81,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 8164843773..2f821288a2 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am @@ -57,7 +57,7 @@ endif check_PROGRAMS = $(VPN_TEST) if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 90b9df7e4c..bf7c34dcba 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am @@ -170,7 +170,7 @@ check_PROGRAMS = \ test_regex_api if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index 14cc114948..a6d5840061 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am @@ -74,7 +74,7 @@ check_SCRIPTS = \ test_local_revocation.py if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ $(check_SCRIPTS) \ $(check_PROGRAMS) diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am index 010d7ebfa7..0f838a7f9b 100644 --- a/src/scalarproduct/Makefile.am +++ b/src/scalarproduct/Makefile.am @@ -67,6 +67,6 @@ check_SCRIPTS = \ test_scalarproduct_negativezero.sh if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_SCRIPTS) endif diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am index fb519f4b15..3404a259cb 100644 --- a/src/secretsharing/Makefile.am +++ b/src/secretsharing/Makefile.am @@ -63,7 +63,7 @@ check_PROGRAMS = \ test_secretsharing_api if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/set/Makefile.am b/src/set/Makefile.am index 32eb3317c7..8d3fe62b90 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am @@ -70,7 +70,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 991a6156f1..b5e9757408 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am @@ -58,7 +58,7 @@ check_PROGRAMS = \ test_statistics_api_watch_zero_value if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) $(check_SCRIPTS) endif diff --git a/src/template/Makefile.am b/src/template/Makefile.am index 42d6a95a07..4df4eb4845 100644 --- a/src/template/Makefile.am +++ b/src/template/Makefile.am @@ -38,7 +38,7 @@ check_PROGRAMS = \ test_template_api if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index e9e537515c..b3a8260c42 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -193,7 +193,7 @@ check_PROGRAMS = \ $(underlay_testcases) if ENABLE_TEST_RUN - TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_testbed_api \ test_testbed_logger_api \ diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 6b229b6fe4..899708102f 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -57,7 +57,7 @@ check_PROGRAMS = \ test_testing_sharedservices if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_testing_portreservation \ test_testing_peerstartup \ diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index b8b534a0a0..97bc28bd26 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -46,7 +46,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index bbd811bb80..2f30a212ac 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -440,7 +440,7 @@ check_PROGRAMS = \ endif if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_transport_testing_startstop \ test_transport_testing_restart \ diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am index ffe58136f6..1b42e53ec0 100644 --- a/src/tun/Makefile.am +++ b/src/tun/Makefile.am @@ -27,7 +27,7 @@ check_PROGRAMS = \ test_regex if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f520d1cb4a..41f5a599b3 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -279,7 +279,7 @@ check_PROGRAMS = \ test_common_logging_runtime_loglevels if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = $(check_PROGRAMS) endif |