aboutsummaryrefslogtreecommitdiff
path: root/src/topology
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-04-24 13:08:05 +0000
committerChristian Grothoff <christian@grothoff.org>2010-04-24 13:08:05 +0000
commit32892c4aa7736eb8039f28d79b5cdb53cdc0061c (patch)
tree9729d165562c1780934a9a979dbc06d7f8470592 /src/topology
parentbf6e480c1dda383bd55b311039d8d41189c5feea (diff)
downloadgnunet-32892c4aa7736eb8039f28d79b5cdb53cdc0061c.tar.gz
gnunet-32892c4aa7736eb8039f28d79b5cdb53cdc0061c.zip
off-line hack fest
Diffstat (limited to 'src/topology')
-rw-r--r--src/topology/Makefile.am10
-rw-r--r--src/topology/test_gnunet_daemon_topology.c (renamed from src/topology/test_gnunet_service_topology.c)10
-rw-r--r--src/topology/test_gnunet_daemon_topology_data.conf (renamed from src/topology/test_gnunet_service_topology_data.conf)0
3 files changed, 10 insertions, 10 deletions
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 88d8800a1..7bedd0910 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -21,15 +21,15 @@ gnunet_daemon_topology_LDADD = \
21 21
22 22
23check_PROGRAMS = \ 23check_PROGRAMS = \
24 test_gnunet_service_topology 24 test_gnunet_daemon_topology
25 25
26TESTS = $(check_PROGRAMS) 26TESTS = $(check_PROGRAMS)
27 27
28test_gnunet_service_topology_SOURCES = \ 28test_gnunet_daemon_topology_SOURCES = \
29 test_gnunet_service_topology.c 29 test_gnunet_daemon_topology.c
30test_gnunet_service_topology_LDADD = \ 30test_gnunet_daemon_topology_LDADD = \
31 $(top_builddir)/src/testing/libgnunettesting.la \ 31 $(top_builddir)/src/testing/libgnunettesting.la \
32 $(top_builddir)/src/util/libgnunetutil.la 32 $(top_builddir)/src/util/libgnunetutil.la
33 33
34EXTRA_DIST = \ 34EXTRA_DIST = \
35 test_gnunet_service_topology_data.conf 35 test_gnunet_daemon_topology_data.conf
diff --git a/src/topology/test_gnunet_service_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 5f0f5cc91..b181e7b2c 100644
--- a/src/topology/test_gnunet_service_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -18,7 +18,7 @@
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20/** 20/**
21 * @file topology/test_gnunet_service_topology.c 21 * @file topology/test_gnunet_daemon_topology.c
22 * @brief testcase for topology maintenance code 22 * @brief testcase for topology maintenance code
23 */ 23 */
24#include "platform.h" 24#include "platform.h"
@@ -146,7 +146,7 @@ check ()
146{ 146{
147 char *const argv[] = { "test-testing", 147 char *const argv[] = { "test-testing",
148 "-c", 148 "-c",
149 "test_gnunet_service_topology_data.conf", 149 "test_gnunet_daemon_topology_data.conf",
150#if VERBOSE 150#if VERBOSE
151 "-L", "DEBUG", 151 "-L", "DEBUG",
152#endif 152#endif
@@ -156,7 +156,7 @@ check ()
156 GNUNET_GETOPT_OPTION_END 156 GNUNET_GETOPT_OPTION_END
157 }; 157 };
158 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, 158 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
159 argv, "test-gnunet-service-topology", "nohelp", 159 argv, "test-gnunet-daemon-topology", "nohelp",
160 options, &run, &ok); 160 options, &run, &ok);
161 return ok; 161 return ok;
162} 162}
@@ -166,7 +166,7 @@ main (int argc, char *argv[])
166{ 166{
167 int ret; 167 int ret;
168 168
169 GNUNET_log_setup ("test-gnunet-service-topology", 169 GNUNET_log_setup ("test-gnunet-daemon-topology",
170#if VERBOSE 170#if VERBOSE
171 "DEBUG", 171 "DEBUG",
172#else 172#else
@@ -179,4 +179,4 @@ main (int argc, char *argv[])
179 return ret; 179 return ret;
180} 180}
181 181
182/* end of test_gnunet_service_topology.c */ 182/* end of test_gnunet_daemon_topology.c */
diff --git a/src/topology/test_gnunet_service_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index d920e9e88..d920e9e88 100644
--- a/src/topology/test_gnunet_service_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf