aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-25 07:14:46 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-25 07:14:46 +0000
commita1eb96a45362ce38357af8cc3106f23a888c6f2c (patch)
tree92ce365e248d32cd8ee23a722bc1dd37733b4ae1
parentf91123615aafcc5fb7452d6a67945f979941cdc4 (diff)
downloadgnunet-a1eb96a45362ce38357af8cc3106f23a888c6f2c.tar.gz
gnunet-a1eb96a45362ce38357af8cc3106f23a888c6f2c.zip
-only run python tests if we have python
-rw-r--r--src/arm/Makefile.am2
-rw-r--r--src/dht/Makefile.am2
-rw-r--r--src/include/gnunet_dnsparser_lib.h2
-rw-r--r--src/statistics/Makefile.am2
4 files changed, 7 insertions, 1 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index dcc0f125f..f5f53a368 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -64,8 +64,10 @@ check_PROGRAMS = \
64 test_exponential_backoff \ 64 test_exponential_backoff \
65 test_gnunet_service_arm 65 test_gnunet_service_arm
66 66
67if HAVE_PYTHON
67check_SCRIPTS = \ 68check_SCRIPTS = \
68 test_gnunet_arm.py 69 test_gnunet_arm.py
70endif
69 71
70if ENABLE_TEST_RUN 72if ENABLE_TEST_RUN
71TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 73TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 0ed649bf5..ed80fdcee 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -214,8 +214,10 @@ EXTRA_DIST = \
214 test_dht_tools.py.in \ 214 test_dht_tools.py.in \
215 test_dht_multipeer_topology.dat 215 test_dht_multipeer_topology.dat
216 216
217if HAVE_PYTHON
217check_SCRIPTS = \ 218check_SCRIPTS = \
218 test_dht_tools.py 219 test_dht_tools.py
220endif
219 221
220do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' 222do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
221 223
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index ce13df261..69915d986 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -184,7 +184,7 @@ struct GNUNET_DNSPARSER_SoaRecord
184{ 184{
185 185
186 /** 186 /**
187 *The domainname of the name server that was the 187 * The domainname of the name server that was the
188 * original or primary source of data for this zone. 188 * original or primary source of data for this zone.
189 * In UTF-8 format. The library will convert from and to DNS-IDNA 189 * In UTF-8 format. The library will convert from and to DNS-IDNA
190 * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an 190 * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index fe792127f..f149bc5f4 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -85,8 +85,10 @@ test_statistics_api_watch_zero_value_LDADD = \
85 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 85 $(top_builddir)/src/statistics/libgnunetstatistics.la \
86 $(top_builddir)/src/util/libgnunetutil.la 86 $(top_builddir)/src/util/libgnunetutil.la
87 87
88if HAVE_PYTHON
88check_SCRIPTS = \ 89check_SCRIPTS = \
89 test_gnunet_statistics.py 90 test_gnunet_statistics.py
91endif
90 92
91do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' 93do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
92 94