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/fs/Makefile.am | |
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/fs/Makefile.am')
-rw-r--r-- | src/fs/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
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 | ||
281 | if ENABLE_TEST_RUN | 281 | if ENABLE_TEST_RUN |
282 | TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;\ | 282 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY) |
283 | export PATH=@prefix@/bin:$$PATH;\ | ||
284 | $(MONKEY) | ||
285 | TESTS = \ | 283 | TESTS = \ |
286 | test_fs_directory \ | 284 | test_fs_directory \ |
287 | test_fs_download \ | 285 | test_fs_download \ |