diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-28 12:00:34 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-28 12:00:34 +0000 |
commit | e3dca1bf40ac8d8a884c261045ad1e9cade49a15 (patch) | |
tree | 9db4cf6a2dcf5716d2d1548cab0d0d9922443c6a | |
parent | 8f4f36517e4220ca5539008cd19cb3b9a40f6499 (diff) | |
download | gnunet-e3dca1bf40ac8d8a884c261045ad1e9cade49a15.tar.gz gnunet-e3dca1bf40ac8d8a884c261045ad1e9cade49a15.zip |
fixes to build
-rw-r--r-- | HACKING | 15 | ||||
-rw-r--r-- | configure.ac | 26 | ||||
-rw-r--r-- | src/arm/Makefile.am | 2 | ||||
-rw-r--r-- | src/core/Makefile.am | 2 | ||||
-rw-r--r-- | src/datacache/Makefile.am | 2 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 2 | ||||
-rw-r--r-- | src/dht/Makefile.am | 6 | ||||
-rw-r--r-- | src/dv/Makefile.am | 8 | ||||
-rw-r--r-- | src/fragmentation/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 2 | ||||
-rw-r--r-- | src/hello/Makefile.am | 2 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 2 | ||||
-rw-r--r-- | src/monkey/Makefile.am | 3 | ||||
-rw-r--r-- | src/nat/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 4 | ||||
-rw-r--r-- | src/statistics/Makefile.am | 2 | ||||
-rw-r--r-- | src/template/Makefile.am | 2 | ||||
-rw-r--r-- | src/testing/Makefile.am | 4 | ||||
-rw-r--r-- | src/topology/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/Makefile.am | 2 | ||||
-rw-r--r-- | src/upnp/Makefile.am | 4 | ||||
-rw-r--r-- | src/util/Makefile.am | 4 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 3 |
24 files changed, 93 insertions, 12 deletions
@@ -80,3 +80,18 @@ Coding style: | |||
80 | instead of | 80 | instead of |
81 | 81 | ||
82 | int i,j; | 82 | int i,j; |
83 | |||
84 | |||
85 | |||
86 | Build-system: | ||
87 | |||
88 | If you have code that is likely not to compile or build rules you might want to not | ||
89 | trigger for most developers, use "if HAVE_EXPERIMENTAL" in your Makefile.am. Then | ||
90 | it is OK to (temporarily) add non-compiling (or known-to-not-port) code. | ||
91 | |||
92 | If you want to compile all testcases but NOT run them, run configure with the | ||
93 | --enable-test-suppression option. | ||
94 | |||
95 | If you want to obtain code coverage results, run configure with the | ||
96 | --enable-coverage option and run the coverage.sh script in contrib/. | ||
97 | |||
diff --git a/configure.ac b/configure.ac index fb6856314..40608c5ce 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -706,6 +706,27 @@ AC_SUBST(DLLDIR) | |||
706 | AC_SUBST(EXT_LIB_PATH) | 706 | AC_SUBST(EXT_LIB_PATH) |
707 | 707 | ||
708 | 708 | ||
709 | # should 'make check' run tests? | ||
710 | AC_MSG_CHECKING(whether to disable running tests) | ||
711 | AC_ARG_ENABLE(testruns, | ||
712 | [AS_HELP_STRING([--enable-test-suppression], | ||
713 | [disable running tests on make check])], | ||
714 | [disable_tests_run=$enableval], | ||
715 | [disable_tests_run="no"]) | ||
716 | AC_MSG_RESULT($disable_test_run) | ||
717 | AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$disable_tests_run" = "xyes"]) | ||
718 | |||
719 | # should experimental code be compiled (code that may not yet compile)? | ||
720 | disable_experimental=yes | ||
721 | AC_MSG_CHECKING(whether to compile experimental code) | ||
722 | AC_ARG_ENABLE(experimental, | ||
723 | [AS_HELP_STRING([--enable-experimental], | ||
724 | [enable compiling experimental code])], | ||
725 | [enable_experimental=$enableval], | ||
726 | [enable_experimental="no"]) | ||
727 | AC_MSG_RESULT($enable_experimental) | ||
728 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) | ||
729 | |||
709 | # gcov compilation | 730 | # gcov compilation |
710 | use_gcov=no | 731 | use_gcov=no |
711 | AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], | 732 | AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], |
@@ -772,6 +793,11 @@ then | |||
772 | AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) | 793 | AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) |
773 | fi | 794 | fi |
774 | 795 | ||
796 | if test "x$pcap" != "x1" | ||
797 | then | ||
798 | AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be installed.]) | ||
799 | fi | ||
800 | |||
775 | if test "x$openssl" != "x1" | 801 | if test "x$openssl" != "x1" |
776 | then | 802 | then |
777 | AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) | 803 | AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) |
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index b60699e85..3f91e9981 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am | |||
@@ -55,7 +55,9 @@ check_PROGRAMS = \ | |||
55 | check_SCRIPTS = \ | 55 | check_SCRIPTS = \ |
56 | test_gnunet_arm.sh | 56 | test_gnunet_arm.sh |
57 | 57 | ||
58 | if !DISABLE_TEST_RUN | ||
58 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 59 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
60 | endif | ||
59 | 61 | ||
60 | test_arm_api_SOURCES = \ | 62 | test_arm_api_SOURCES = \ |
61 | test_arm_api.c | 63 | test_arm_api.c |
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index d6b938764..83a8d1d35 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -44,7 +44,9 @@ check_PROGRAMS = \ | |||
44 | test_core_api \ | 44 | test_core_api \ |
45 | test_core_api_reliability | 45 | test_core_api_reliability |
46 | 46 | ||
47 | if !DISABLE_TEST_RUN | ||
47 | TESTS = $(check_PROGRAMS) | 48 | TESTS = $(check_PROGRAMS) |
49 | endif | ||
48 | 50 | ||
49 | test_core_api_SOURCES = \ | 51 | test_core_api_SOURCES = \ |
50 | test_core_api.c | 52 | test_core_api.c |
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 564af9f28..0713d792d 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -52,7 +52,9 @@ check_PROGRAMS = \ | |||
52 | test_datacache_quota \ | 52 | test_datacache_quota \ |
53 | perf_datacache | 53 | perf_datacache |
54 | 54 | ||
55 | if !DISABLE_TEST_RUN | ||
55 | TESTS = $(check_PROGRAMS) | 56 | TESTS = $(check_PROGRAMS) |
57 | endif | ||
56 | 58 | ||
57 | test_datacache_SOURCES = \ | 59 | test_datacache_SOURCES = \ |
58 | test_datacache.c | 60 | test_datacache.c |
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 76d342bbd..7904907b6 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -63,7 +63,9 @@ check_PROGRAMS = \ | |||
63 | perf_datastore_api \ | 63 | perf_datastore_api \ |
64 | perf_plugin_datastore | 64 | perf_plugin_datastore |
65 | 65 | ||
66 | if !DISABLE_TEST_RUN | ||
66 | TESTS = $(check_PROGRAMS) | 67 | TESTS = $(check_PROGRAMS) |
68 | endif | ||
67 | 69 | ||
68 | test_datastore_api_SOURCES = \ | 70 | test_datastore_api_SOURCES = \ |
69 | test_datastore_api.c | 71 | test_datastore_api.c |
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 4f4280147..b96ce45e7 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -4,7 +4,7 @@ if MINGW | |||
4 | endif | 4 | endif |
5 | 5 | ||
6 | plugindir = $(libdir)/gnunet | 6 | plugindir = $(libdir)/gnunet |
7 | HAVE_MYSQL = 0 | 7 | HAVE_MYSQL=0 |
8 | if HAVE_MYSQL | 8 | if HAVE_MYSQL |
9 | MYSQL_PLUGIN = libgnunet_plugin_dhtlog_mysql.la | 9 | MYSQL_PLUGIN = libgnunet_plugin_dhtlog_mysql.la |
10 | endif | 10 | endif |
@@ -61,7 +61,7 @@ libgnunetdht_la_LDFLAGS = \ | |||
61 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 61 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
62 | -version-info 0:0:0 | 62 | -version-info 0:0:0 |
63 | 63 | ||
64 | if HAVE_MYSQL | 64 | if HAVE_EXPERIMENTAL |
65 | STUD_PROGS = gnunet-service-dht-can \ | 65 | STUD_PROGS = gnunet-service-dht-can \ |
66 | gnunet-service-dht-freenet \ | 66 | gnunet-service-dht-freenet \ |
67 | gnunet-service-dht-kademlia \ | 67 | gnunet-service-dht-kademlia \ |
@@ -179,9 +179,11 @@ check_PROGRAMS = \ | |||
179 | test_dht_multipeer \ | 179 | test_dht_multipeer \ |
180 | test_dhtlog | 180 | test_dhtlog |
181 | 181 | ||
182 | if !DISABLE_TEST_RUN | ||
182 | TESTS = test_dht_api $(check_SCRIPTS) \ | 183 | TESTS = test_dht_api $(check_SCRIPTS) \ |
183 | test_dht_twopeer \ | 184 | test_dht_twopeer \ |
184 | test_dht_twopeer_put_get | 185 | test_dht_twopeer_put_get |
186 | endif | ||
185 | 187 | ||
186 | test_dht_api_SOURCES = \ | 188 | test_dht_api_SOURCES = \ |
187 | test_dht_api.c | 189 | test_dht_api.c |
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 14dd18c1c..5c4a2fc55 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am | |||
@@ -47,13 +47,15 @@ libgnunet_plugin_transport_dv_la_LIBADD = \ | |||
47 | $(top_builddir)/src/util/libgnunetutil.la | 47 | $(top_builddir)/src/util/libgnunetutil.la |
48 | libgnunet_plugin_transport_dv_la_LDFLAGS = \ | 48 | libgnunet_plugin_transport_dv_la_LDFLAGS = \ |
49 | $(GN_PLUGIN_LDFLAGS) | 49 | $(GN_PLUGIN_LDFLAGS) |
50 | 50 | ||
51 | 51 | ||
52 | check_PROGRAMS = \ | 52 | check_PROGRAMS = \ |
53 | test_transport_api_dv | 53 | test_transport_api_dv |
54 | # test_dv_topology | 54 | # test_dv_topology |
55 | 55 | ||
56 | if !DISABLE_TEST_RUN | ||
56 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 57 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
58 | endif | ||
57 | 59 | ||
58 | test_transport_api_dv_SOURCES = \ | 60 | test_transport_api_dv_SOURCES = \ |
59 | test_transport_api_dv.c | 61 | test_transport_api_dv.c |
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am index 47915a35f..f00c0958c 100644 --- a/src/fragmentation/Makefile.am +++ b/src/fragmentation/Makefile.am | |||
@@ -18,7 +18,9 @@ libgnunetfragmentation_la_LIBADD = \ | |||
18 | check_PROGRAMS = \ | 18 | check_PROGRAMS = \ |
19 | test_fragmentation | 19 | test_fragmentation |
20 | 20 | ||
21 | if !DISABLE_TEST_RUN | ||
21 | TESTS = $(check_PROGRAMS) | 22 | TESTS = $(check_PROGRAMS) |
23 | endif | ||
22 | 24 | ||
23 | test_fragmentation_SOURCES = \ | 25 | test_fragmentation_SOURCES = \ |
24 | test_frag_ji.c | 26 | test_frag_ji.c |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 9625af830..4a7e4621a 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -143,6 +143,7 @@ check_SCRIPTS = \ | |||
143 | test_gnunet_fs_idx.py | 143 | test_gnunet_fs_idx.py |
144 | endif | 144 | endif |
145 | 145 | ||
146 | if !DISABLE_TEST_RUN | ||
146 | TESTS = \ | 147 | TESTS = \ |
147 | test_fs_directory \ | 148 | test_fs_directory \ |
148 | test_fs_download \ | 149 | test_fs_download \ |
@@ -163,6 +164,7 @@ TESTS = \ | |||
163 | test_gnunet_service_fs_migration \ | 164 | test_gnunet_service_fs_migration \ |
164 | test_gnunet_service_fs_p2p \ | 165 | test_gnunet_service_fs_p2p \ |
165 | $(check_SCRIPTS) | 166 | $(check_SCRIPTS) |
167 | endif | ||
166 | 168 | ||
167 | 169 | ||
168 | test_fs_directory_SOURCES = \ | 170 | test_fs_directory_SOURCES = \ |
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index c831ecbbc..703776c65 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am | |||
@@ -19,7 +19,9 @@ libgnunethello_la_LIBADD = \ | |||
19 | check_PROGRAMS = \ | 19 | check_PROGRAMS = \ |
20 | test_hello | 20 | test_hello |
21 | 21 | ||
22 | if !DISABLE_TEST_RUN | ||
22 | TESTS = $(check_PROGRAMS) | 23 | TESTS = $(check_PROGRAMS) |
24 | endif | ||
23 | 25 | ||
24 | test_hello_SOURCES = \ | 26 | test_hello_SOURCES = \ |
25 | test_hello.c | 27 | test_hello.c |
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 14b872ed3..e2dd27a29 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -36,10 +36,12 @@ check_PROGRAMS = \ | |||
36 | test_gnunet_daemon_hostlist_learning | 36 | test_gnunet_daemon_hostlist_learning |
37 | 37 | ||
38 | if HAVE_MHD | 38 | if HAVE_MHD |
39 | if !DISABLE_TEST_RUN | ||
39 | TESTS = \ | 40 | TESTS = \ |
40 | test_gnunet_daemon_hostlist \ | 41 | test_gnunet_daemon_hostlist \ |
41 | test_gnunet_daemon_hostlist_learning | 42 | test_gnunet_daemon_hostlist_learning |
42 | endif | 43 | endif |
44 | endif | ||
43 | 45 | ||
44 | test_gnunet_daemon_hostlist_SOURCES = \ | 46 | test_gnunet_daemon_hostlist_SOURCES = \ |
45 | test_gnunet_daemon_hostlist.c | 47 | test_gnunet_daemon_hostlist.c |
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am index 6c8c6f9b3..3ac9a1744 100644 --- a/src/monkey/Makefile.am +++ b/src/monkey/Makefile.am | |||
@@ -66,8 +66,9 @@ bug_null_pointer_exception_LDADD = \ | |||
66 | $(top_builddir)/src/util/libgnunetutil.la \ | 66 | $(top_builddir)/src/util/libgnunetutil.la \ |
67 | $(GN_LIBINTL) | 67 | $(GN_LIBINTL) |
68 | 68 | ||
69 | 69 | if !DISABLE_TEST_RUN | |
70 | #TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 70 | #TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
71 | endif | ||
71 | 72 | ||
72 | check_SCRIPTS = \ | 73 | check_SCRIPTS = \ |
73 | test_gnunet_monkey.sh | 74 | test_gnunet_monkey.sh |
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 57be6832d..14a4d4e92 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -35,7 +35,9 @@ libgnunetnat_la_LDFLAGS = \ | |||
35 | check_PROGRAMS = \ | 35 | check_PROGRAMS = \ |
36 | test-nat | 36 | test-nat |
37 | 37 | ||
38 | if !DISABLE_TEST_RUN | ||
38 | TESTS = $(check_PROGRAMS) | 39 | TESTS = $(check_PROGRAMS) |
40 | endif | ||
39 | 41 | ||
40 | test_nat_SOURCES = \ | 42 | test_nat_SOURCES = \ |
41 | test_nat.c | 43 | test_nat.c |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index e6593752d..f4f41ffad 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -24,7 +24,9 @@ check_SCRIPTS = \ | |||
24 | test_gnunet_peerinfo.py | 24 | test_gnunet_peerinfo.py |
25 | endif | 25 | endif |
26 | 26 | ||
27 | if !DISABLE_TEST_RUN | ||
27 | TESTS = $(check_SCRIPTS) | 28 | TESTS = $(check_SCRIPTS) |
29 | endif | ||
28 | 30 | ||
29 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | 31 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' |
30 | 32 | ||
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index a95eafba1..31c7ab92d 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -37,7 +37,9 @@ gnunet_service_peerinfo_LDADD = \ | |||
37 | check_PROGRAMS = \ | 37 | check_PROGRAMS = \ |
38 | test_peerinfo_api | 38 | test_peerinfo_api |
39 | 39 | ||
40 | TESTS = $(check_PROGRAMS) # $(check_SCRIPTS) | 40 | if !DISABLE_TEST_RUN |
41 | TESTS = $(check_PROGRAMS) | ||
42 | endif | ||
41 | 43 | ||
42 | test_peerinfo_api_SOURCES = \ | 44 | test_peerinfo_api_SOURCES = \ |
43 | test_peerinfo_api.c | 45 | test_peerinfo_api.c |
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 0e2e4d727..6a276dbd5 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am | |||
@@ -45,7 +45,9 @@ check_PROGRAMS = \ | |||
45 | test_statistics_api \ | 45 | test_statistics_api \ |
46 | test_statistics_api_loop | 46 | test_statistics_api_loop |
47 | 47 | ||
48 | if !DISABLE_TEST_RUN | ||
48 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 49 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
50 | endif | ||
49 | 51 | ||
50 | test_statistics_api_SOURCES = \ | 52 | test_statistics_api_SOURCES = \ |
51 | test_statistics_api.c | 53 | test_statistics_api.c |
diff --git a/src/template/Makefile.am b/src/template/Makefile.am index 47d6b4165..f17e48166 100644 --- a/src/template/Makefile.am +++ b/src/template/Makefile.am | |||
@@ -28,7 +28,9 @@ gnunet_service_template_LDADD = \ | |||
28 | check_PROGRAMS = \ | 28 | check_PROGRAMS = \ |
29 | test_template_api | 29 | test_template_api |
30 | 30 | ||
31 | if !DISABLE_TEST_RUN | ||
31 | TESTS = $(check_PROGRAMS) | 32 | TESTS = $(check_PROGRAMS) |
33 | endif | ||
32 | 34 | ||
33 | test_template_api_SOURCES = \ | 35 | test_template_api_SOURCES = \ |
34 | test_template_api.c | 36 | test_template_api.c |
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 152b528d2..77d3e8cbe 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -40,7 +40,8 @@ check_PROGRAMS = \ | |||
40 | test_testing_topology_internat \ | 40 | test_testing_topology_internat \ |
41 | test_testing_topology_none \ | 41 | test_testing_topology_none \ |
42 | test_testing_topology_scale_free | 42 | test_testing_topology_scale_free |
43 | 43 | ||
44 | if !DISABLE_TEST_RUN | ||
44 | TESTS = \ | 45 | TESTS = \ |
45 | test_testing \ | 46 | test_testing \ |
46 | test_testing_connect \ | 47 | test_testing_connect \ |
@@ -60,6 +61,7 @@ TESTS = \ | |||
60 | # test_testing_topology_erdos_renyi \ | 61 | # test_testing_topology_erdos_renyi \ |
61 | # test_testing_topology_internat \ | 62 | # test_testing_topology_internat \ |
62 | # test_testing_topology_scale_free | 63 | # test_testing_topology_scale_free |
64 | endif | ||
63 | 65 | ||
64 | test_testing_SOURCES = \ | 66 | test_testing_SOURCES = \ |
65 | test_testing.c | 67 | test_testing.c |
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 7bedd0910..00038a236 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -23,7 +23,9 @@ gnunet_daemon_topology_LDADD = \ | |||
23 | check_PROGRAMS = \ | 23 | check_PROGRAMS = \ |
24 | test_gnunet_daemon_topology | 24 | test_gnunet_daemon_topology |
25 | 25 | ||
26 | if !DISABLE_TEST_RUN | ||
26 | TESTS = $(check_PROGRAMS) | 27 | TESTS = $(check_PROGRAMS) |
28 | endif | ||
27 | 29 | ||
28 | test_gnunet_daemon_topology_SOURCES = \ | 30 | test_gnunet_daemon_topology_SOURCES = \ |
29 | test_gnunet_daemon_topology.c | 31 | test_gnunet_daemon_topology.c |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 2ec29bb9b..c9f458b08 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -176,6 +176,7 @@ check_PROGRAMS = \ | |||
176 | $(HTTPS_REL_TEST) | 176 | $(HTTPS_REL_TEST) |
177 | # TODO: add tests for nat, etc. | 177 | # TODO: add tests for nat, etc. |
178 | 178 | ||
179 | if !DISABLE_TEST_RUN | ||
179 | TESTS = \ | 180 | TESTS = \ |
180 | test_transport_api_tcp \ | 181 | test_transport_api_tcp \ |
181 | test_transport_api_tcp_nat \ | 182 | test_transport_api_tcp_nat \ |
@@ -189,6 +190,7 @@ TESTS = \ | |||
189 | test_transport_api_reliability_tcp_nat \ | 190 | test_transport_api_reliability_tcp_nat \ |
190 | $(HTTP_REL_TEST) \ | 191 | $(HTTP_REL_TEST) \ |
191 | $(HTTPS_REL_TEST) | 192 | $(HTTPS_REL_TEST) |
193 | endif | ||
192 | 194 | ||
193 | test_transport_api_tcp_SOURCES = \ | 195 | test_transport_api_tcp_SOURCES = \ |
194 | test_transport_api.c | 196 | test_transport_api.c |
diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am index 02a2b139d..83ccf5b46 100644 --- a/src/upnp/Makefile.am +++ b/src/upnp/Makefile.am | |||
@@ -44,10 +44,12 @@ gnunet_service_upnp_LDADD = \ | |||
44 | $(GN_LIBINTL) | 44 | $(GN_LIBINTL) |
45 | 45 | ||
46 | 46 | ||
47 | check_PROGRAMS = \ | 47 | check_PROGRAMS = \ |
48 | test_upnp | 48 | test_upnp |
49 | 49 | ||
50 | if !DISABLE_TEST_RUN | ||
50 | TESTS = $(check_PROGRAMS) | 51 | TESTS = $(check_PROGRAMS) |
52 | endif | ||
51 | 53 | ||
52 | test_upnp_SOURCES = \ | 54 | test_upnp_SOURCES = \ |
53 | test_upnp.c | 55 | test_upnp.c |
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 4b28cabf1..491e61d8d 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -144,9 +144,9 @@ check_PROGRAMS = \ | |||
144 | perf_crypto_hash \ | 144 | perf_crypto_hash \ |
145 | test_os_start_process | 145 | test_os_start_process |
146 | 146 | ||
147 | 147 | if !DISABLE_TEST_RUN | |
148 | TESTS = $(check_PROGRAMS) | 148 | TESTS = $(check_PROGRAMS) |
149 | 149 | endif | |
150 | 150 | ||
151 | test_bio_SOURCES = \ | 151 | test_bio_SOURCES = \ |
152 | test_bio.c | 152 | test_bio.c |
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index afb6a7ba9..77f04f0bd 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -47,9 +47,10 @@ gnunet_daemon_vpn_LDADD = \ | |||
47 | #check_PROGRAMS = \ | 47 | #check_PROGRAMS = \ |
48 | # test_XXX | 48 | # test_XXX |
49 | 49 | ||
50 | if !DISABLE_TEST_RUN | ||
50 | #TESTS = \ | 51 | #TESTS = \ |
51 | # test_transport_api_tcp | 52 | # test_transport_api_tcp |
52 | 53 | endif | |
53 | 54 | ||
54 | #test_transport_api_tcp_SOURCES = \ | 55 | #test_transport_api_tcp_SOURCES = \ |
55 | # test_transport_api.c | 56 | # test_transport_api.c |