diff options
author | t3sserakt <t3ss@posteo.de> | 2021-12-08 11:26:23 +0100 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-12-08 11:26:23 +0100 |
commit | 74fffdf71d7eaba596815da100ef4fe7d8ef0946 (patch) | |
tree | 413160879894a96357222f7d5f989430664e0c75 /src | |
parent | 35bad1f7e64f26e4e7777feffaaaf066c269a619 (diff) | |
download | gnunet-74fffdf71d7eaba596815da100ef4fe7d8ef0946.tar.gz gnunet-74fffdf71d7eaba596815da100ef4fe7d8ef0946.zip |
- fixed Makefile.am
Diffstat (limited to 'src')
-rw-r--r-- | src/dhtu/Makefile.am | 12 | ||||
-rw-r--r-- | src/dhtu/test_dhtu_ip.c | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/dhtu/Makefile.am b/src/dhtu/Makefile.am index b280f18e2..0e10721cd 100644 --- a/src/dhtu/Makefile.am +++ b/src/dhtu/Makefile.am | |||
@@ -55,6 +55,18 @@ libgnunettestingdhtu_la_LDFLAGS = \ | |||
55 | $(GN_LIB_LDFLAGS) \ | 55 | $(GN_LIB_LDFLAGS) \ |
56 | -version-info 0:0:0 | 56 | -version-info 0:0:0 |
57 | 57 | ||
58 | |||
59 | |||
60 | test_dhtu_ip_SOURCES = \ | ||
61 | test_dhtu_ip.c | ||
62 | test_dhtu_ip_LDADD = \ | ||
63 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
64 | $(top_builddir)/src/arm/libgnunetarm.la \ | ||
65 | $(top_builddir)/src/util/libgnunetutil.la | ||
66 | |||
67 | check_PROGRAMS = \ | ||
68 | test_dhtu_ip | ||
69 | |||
58 | if ENABLE_TEST_RUN | 70 | if ENABLE_TEST_RUN |
59 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 71 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
60 | TESTS = \ | 72 | TESTS = \ |
diff --git a/src/dhtu/test_dhtu_ip.c b/src/dhtu/test_dhtu_ip.c index 7913cfc35..030b17b5f 100644 --- a/src/dhtu/test_dhtu_ip.c +++ b/src/dhtu/test_dhtu_ip.c | |||
@@ -37,14 +37,9 @@ main (int argc, | |||
37 | char *const *argv) | 37 | char *const *argv) |
38 | { | 38 | { |
39 | struct GNUNET_TESTING_Command commands[] = { | 39 | struct GNUNET_TESTING_Command commands[] = { |
40 | GNUNET_TESTING_cmd_netjail_start ("netjail-start", | ||
41 | CONFIG_FILE), | ||
42 | GNUNET_TESTING_cmd_netjail_stop ("netjail-stop", | ||
43 | CONFIG_FILE), | ||
44 | GNUNET_TESTING_cmd_end () | 40 | GNUNET_TESTING_cmd_end () |
45 | }; | 41 | }; |
46 | 42 | ||
47 | return GNUNET_TESTING_main (NULL, | 43 | return GNUNET_TESTING_main (commands, |
48 | commands, | ||
49 | TIMEOUT); | 44 | TIMEOUT); |
50 | } | 45 | } |