diff options
| author | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
| commit | 49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d (patch) | |
| tree | 71830c1751e291e45795958cad15e9dfa8239e1a /src/integration-tests/Makefile.am | |
| parent | b9333fef25b57bdd7f556f5fb73f9abaef9bc5ef (diff) | |
| parent | e500e9ec3678dfbb666d173854c134ac3858f8b1 (diff) | |
| download | gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.tar.gz gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.zip | |
Merge branch 'master' into rewrite_of_cadet_test
Diffstat (limited to 'src/integration-tests/Makefile.am')
| -rw-r--r-- | src/integration-tests/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index f456544db..b3adc3a0f 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
| @@ -21,7 +21,6 @@ check_SCRIPTS = \ | |||
| 21 | endif | 21 | endif |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | if HAVE_MHD | ||
| 25 | if ENABLE_TEST_RUN | 24 | if ENABLE_TEST_RUN |
| 26 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 25 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
| 27 | if HAVE_LIBGNURL | 26 | if HAVE_LIBGNURL |
| @@ -34,7 +33,6 @@ TESTS = \ | |||
| 34 | endif | 33 | endif |
| 35 | endif | 34 | endif |
| 36 | endif | 35 | endif |
| 37 | endif | ||
| 38 | 36 | ||
| 39 | SUFFIXES = .py.in .py | 37 | SUFFIXES = .py.in .py |
| 40 | .py.in.py: | 38 | .py.in.py: |