[GNUnet-SVN] r12377 - in gnunet: . src/arm src/core src/datacache src/da

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12377 - in gnunet: . src/arm src/core src/datacache src/da

From:	gnunet
Subject:	[GNUnet-SVN] r12377 - in gnunet: . src/arm src/core src/datacache src/datastore src/dht src/dv src/fragmentation src/fs src/hello src/hostlist src/monkey src/nat src/peerinfo src/peerinfo-tool src/statistics src/template src/testing src/topology src/transport src/upnp src/util src/vpn
Date:	Wed, 28 Jul 2010 14:00:34 +0200
Author: grothoff
Date: 2010-07-28 14:00:34 +0200 (Wed, 28 Jul 2010)
New Revision: 12377

Modified:
   gnunet/HACKING
   gnunet/configure.ac
   gnunet/src/arm/Makefile.am
   gnunet/src/core/Makefile.am
   gnunet/src/datacache/Makefile.am
   gnunet/src/datastore/Makefile.am
   gnunet/src/dht/Makefile.am
   gnunet/src/dv/Makefile.am
   gnunet/src/fragmentation/Makefile.am
   gnunet/src/fs/Makefile.am
   gnunet/src/hello/Makefile.am
   gnunet/src/hostlist/Makefile.am
   gnunet/src/monkey/Makefile.am
   gnunet/src/nat/Makefile.am
   gnunet/src/peerinfo-tool/Makefile.am
   gnunet/src/peerinfo/Makefile.am
   gnunet/src/statistics/Makefile.am
   gnunet/src/template/Makefile.am
   gnunet/src/testing/Makefile.am
   gnunet/src/topology/Makefile.am
   gnunet/src/transport/Makefile.am
   gnunet/src/upnp/Makefile.am
   gnunet/src/util/Makefile.am
   gnunet/src/vpn/Makefile.am
Log:
fixes to build

Modified: gnunet/HACKING
===================================================================
--- gnunet/HACKING      2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/HACKING      2010-07-28 12:00:34 UTC (rev 12377)
@@ -80,3 +80,18 @@
   instead of
 
   int i,j;
+
+
+
+Build-system:
+
+If you have code that is likely not to compile or build rules you might want 
to not
+trigger for most developers, use "if HAVE_EXPERIMENTAL" in your Makefile.am.  
Then
+it is OK to (temporarily) add non-compiling (or known-to-not-port) code.
+
+If you want to compile all testcases but NOT run them, run configure with the
+--enable-test-suppression option.
+
+If you want to obtain code coverage results, run configure with the
+--enable-coverage option and run the coverage.sh script in contrib/.
+

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/configure.ac 2010-07-28 12:00:34 UTC (rev 12377)
@@ -706,6 +706,27 @@
 AC_SUBST(EXT_LIB_PATH)
 
 
+# should 'make check' run tests?
+AC_MSG_CHECKING(whether to disable running tests)
+AC_ARG_ENABLE(testruns,
+   [AS_HELP_STRING([--enable-test-suppression],
+               [disable running tests on make check])],
+   [disable_tests_run=$enableval],
+   [disable_tests_run="no"])
+AC_MSG_RESULT($disable_test_run)
+AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$disable_tests_run" = "xyes"])
+
+# should experimental code be compiled (code that may not yet compile)?
+disable_experimental=yes
+AC_MSG_CHECKING(whether to compile experimental code)
+AC_ARG_ENABLE(experimental,
+   [AS_HELP_STRING([--enable-experimental],
+               [enable compiling experimental code])],
+   [enable_experimental=$enableval],
+   [enable_experimental="no"])
+AC_MSG_RESULT($enable_experimental)
+AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+
 # gcov compilation
 use_gcov=no
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
@@ -772,6 +793,11 @@
  AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.])
 fi
 
+if test "x$pcap" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be 
installed.])
+fi
+
 if test "x$openssl" != "x1"
 then
  AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.])

Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am  2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/arm/Makefile.am  2010-07-28 12:00:34 UTC (rev 12377)
@@ -55,7 +55,9 @@
 check_SCRIPTS = \
  test_gnunet_arm.sh
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
+endif
 
 test_arm_api_SOURCES = \
  test_arm_api.c

Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/core/Makefile.am 2010-07-28 12:00:34 UTC (rev 12377)
@@ -44,7 +44,9 @@
  test_core_api \
  test_core_api_reliability
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_core_api_SOURCES = \
  test_core_api.c

Modified: gnunet/src/datacache/Makefile.am
===================================================================
--- gnunet/src/datacache/Makefile.am    2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/datacache/Makefile.am    2010-07-28 12:00:34 UTC (rev 12377)
@@ -52,7 +52,9 @@
  test_datacache_quota \
  perf_datacache 
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_datacache_SOURCES = \
  test_datacache.c

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/datastore/Makefile.am    2010-07-28 12:00:34 UTC (rev 12377)
@@ -63,7 +63,9 @@
  perf_datastore_api \
  perf_plugin_datastore
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_datastore_api_SOURCES = \
  test_datastore_api.c

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/dht/Makefile.am  2010-07-28 12:00:34 UTC (rev 12377)
@@ -4,7 +4,7 @@
 endif
 
 plugindir = $(libdir)/gnunet
-HAVE_MYSQL = 0
+HAVE_MYSQL=0
 if HAVE_MYSQL
  MYSQL_PLUGIN = libgnunet_plugin_dhtlog_mysql.la
 endif
@@ -61,7 +61,7 @@
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-if HAVE_MYSQL
+if HAVE_EXPERIMENTAL
 STUD_PROGS =  gnunet-service-dht-can \
  gnunet-service-dht-freenet \
  gnunet-service-dht-kademlia \
@@ -179,9 +179,11 @@
  test_dht_multipeer \
  test_dhtlog
 
+if !DISABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_twopeer_put_get
+endif
 
 test_dht_api_SOURCES = \
  test_dht_api.c

Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am   2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/dv/Makefile.am   2010-07-28 12:00:34 UTC (rev 12377)
@@ -47,13 +47,15 @@
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
- 
- 
+
+
 check_PROGRAMS = \
  test_transport_api_dv
 # test_dv_topology
- 
+
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
 
 test_transport_api_dv_SOURCES = \
  test_transport_api_dv.c

Modified: gnunet/src/fragmentation/Makefile.am
===================================================================
--- gnunet/src/fragmentation/Makefile.am        2010-07-28 11:24:09 UTC (rev 
12376)
+++ gnunet/src/fragmentation/Makefile.am        2010-07-28 12:00:34 UTC (rev 
12377)
@@ -18,7 +18,9 @@
 check_PROGRAMS = \
  test_fragmentation
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_fragmentation_SOURCES = \
  test_frag_ji.c

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/fs/Makefile.am   2010-07-28 12:00:34 UTC (rev 12377)
@@ -143,6 +143,7 @@
  test_gnunet_fs_idx.py
 endif
 
+if !DISABLE_TEST_RUN
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -163,6 +164,7 @@
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
  $(check_SCRIPTS)  
+endif
 
 
 test_fs_directory_SOURCES = \

Modified: gnunet/src/hello/Makefile.am
===================================================================
--- gnunet/src/hello/Makefile.am        2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/hello/Makefile.am        2010-07-28 12:00:34 UTC (rev 12377)
@@ -19,7 +19,9 @@
 check_PROGRAMS = \
  test_hello
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_hello_SOURCES = \
  test_hello.c

Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am     2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/hostlist/Makefile.am     2010-07-28 12:00:34 UTC (rev 12377)
@@ -36,10 +36,12 @@
  test_gnunet_daemon_hostlist_learning
 
 if HAVE_MHD
+if !DISABLE_TEST_RUN
 TESTS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_learning
 endif
+endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c

Modified: gnunet/src/monkey/Makefile.am
===================================================================
--- gnunet/src/monkey/Makefile.am       2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/monkey/Makefile.am       2010-07-28 12:00:34 UTC (rev 12377)
@@ -66,8 +66,9 @@
        $(top_builddir)/src/util/libgnunetutil.la \
        $(GN_LIBINTL)
 
-
+if !DISABLE_TEST_RUN
 #TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
 
 check_SCRIPTS = \
   test_gnunet_monkey.sh

Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am  2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/nat/Makefile.am  2010-07-28 12:00:34 UTC (rev 12377)
@@ -35,7 +35,9 @@
 check_PROGRAMS = \
   test-nat
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_nat_SOURCES = \
   test_nat.c

Modified: gnunet/src/peerinfo/Makefile.am
===================================================================
--- gnunet/src/peerinfo/Makefile.am     2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/peerinfo/Makefile.am     2010-07-28 12:00:34 UTC (rev 12377)
@@ -37,7 +37,9 @@
 check_PROGRAMS = \
  test_peerinfo_api
 
-TESTS = $(check_PROGRAMS) # $(check_SCRIPTS)
+if !DISABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
 
 test_peerinfo_api_SOURCES = \
  test_peerinfo_api.c

Modified: gnunet/src/peerinfo-tool/Makefile.am
===================================================================
--- gnunet/src/peerinfo-tool/Makefile.am        2010-07-28 11:24:09 UTC (rev 
12376)
+++ gnunet/src/peerinfo-tool/Makefile.am        2010-07-28 12:00:34 UTC (rev 
12377)
@@ -24,7 +24,9 @@
  test_gnunet_peerinfo.py 
 endif
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_SCRIPTS)
+endif
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
 

Modified: gnunet/src/statistics/Makefile.am
===================================================================
--- gnunet/src/statistics/Makefile.am   2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/statistics/Makefile.am   2010-07-28 12:00:34 UTC (rev 12377)
@@ -45,7 +45,9 @@
  test_statistics_api \
  test_statistics_api_loop
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
 
 test_statistics_api_SOURCES = \
  test_statistics_api.c

Modified: gnunet/src/template/Makefile.am
===================================================================
--- gnunet/src/template/Makefile.am     2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/template/Makefile.am     2010-07-28 12:00:34 UTC (rev 12377)
@@ -28,7 +28,9 @@
 check_PROGRAMS = \
  test_template_api
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_template_api_SOURCES = \
  test_template_api.c

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/testing/Makefile.am      2010-07-28 12:00:34 UTC (rev 12377)
@@ -40,7 +40,8 @@
  test_testing_topology_internat \
  test_testing_topology_none \
  test_testing_topology_scale_free
- 
+
+if !DISABLE_TEST_RUN 
 TESTS = \
  test_testing \
  test_testing_connect \
@@ -60,6 +61,7 @@
 # test_testing_topology_erdos_renyi \
 # test_testing_topology_internat \
 # test_testing_topology_scale_free
+endif
 
 test_testing_SOURCES = \
  test_testing.c

Modified: gnunet/src/topology/Makefile.am
===================================================================
--- gnunet/src/topology/Makefile.am     2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/topology/Makefile.am     2010-07-28 12:00:34 UTC (rev 12377)
@@ -23,7 +23,9 @@
 check_PROGRAMS = \
  test_gnunet_daemon_topology
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_gnunet_daemon_topology_SOURCES = \
  test_gnunet_daemon_topology.c

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/transport/Makefile.am    2010-07-28 12:00:34 UTC (rev 12377)
@@ -176,6 +176,7 @@
  $(HTTPS_REL_TEST)
 # TODO: add tests for nat, etc.
 
+if !DISABLE_TEST_RUN
 TESTS = \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
@@ -189,6 +190,7 @@
  test_transport_api_reliability_tcp_nat \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST)
+endif
 
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c

Modified: gnunet/src/upnp/Makefile.am
===================================================================
--- gnunet/src/upnp/Makefile.am 2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/upnp/Makefile.am 2010-07-28 12:00:34 UTC (rev 12377)
@@ -44,10 +44,12 @@
   $(GN_LIBINTL)
 
 
-check_PROGRAMS = \ 
+check_PROGRAMS = \
  test_upnp
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_upnp_SOURCES = \
  test_upnp.c

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/util/Makefile.am 2010-07-28 12:00:34 UTC (rev 12377)
@@ -144,10 +144,10 @@
  perf_crypto_hash \
  test_os_start_process 
 
-
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
-
 test_bio_SOURCES = \
  test_bio.c
 test_bio_LDADD = \

Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am  2010-07-28 11:24:09 UTC (rev 12376)
+++ gnunet/src/vpn/Makefile.am  2010-07-28 12:00:34 UTC (rev 12377)
@@ -47,10 +47,11 @@
 #check_PROGRAMS = \
 # test_XXX
 
+if !DISABLE_TEST_RUN
 #TESTS = \
 # test_transport_api_tcp 
+endif
 
-
 #test_transport_api_tcp_SOURCES = \
 # test_transport_api.c
 #test_transport_api_tcp_LDADD = \
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r12377 - in gnunet: . src/arm src/core src/datacache src/datastore src/dht src/dv src/fragmentation src/fs src/hello src/hostlist src/monkey src/nat src/peerinfo src/peerinfo-tool src/statistics src/template src/testing src/topology src/transport src/upnp src/util src/vpn, gnunet <=
Prev by Date: [GNUnet-SVN] r12376 - gnunet/src/dht
Next by Date: [GNUnet-SVN] r12378 - gnunet/src/transport
Previous by thread: [GNUnet-SVN] r12376 - gnunet/src/dht
Next by thread: [GNUnet-SVN] r12378 - gnunet/src/transport
Index(es):
- Date
- Thread