diff options
author | LRN <lrn1986@gmail.com> | 2014-02-02 17:11:17 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-02-02 17:11:17 +0000 |
commit | 611d42112112fe6e11df8a6417f3a0b69d97143f (patch) | |
tree | 313e787c8f7def8d6c2773bcf8b4bc3df6b3d633 /src/testbed | |
parent | c7cbdf47e1cf85e04e1f229765f69b0b95cbc401 (diff) | |
download | gnunet-611d42112112fe6e11df8a6417f3a0b69d97143f.tar.gz gnunet-611d42112112fe6e11df8a6417f3a0b69d97143f.zip |
Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden, allow TESTS_ENVIRONMENT to be overrided (use AM_TESTS_ENVIRONMENT))
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||
195 | if ENABLE_TEST_RUN | 195 | if 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 \ |