diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-16 12:33:41 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-16 12:33:41 +0000 |
commit | 92bc91f21ea5f201526775cd67df755eb50a0a78 (patch) | |
tree | 7a7f654e04b91316b43f9e28a48fcc4f52d470e4 /src/testbed | |
parent | 985c18baa426b7383faaba20651d793553f9a0cb (diff) | |
download | gnunet-92bc91f21ea5f201526775cd67df755eb50a0a78.tar.gz gnunet-92bc91f21ea5f201526775cd67df755eb50a0a78.zip |
rename
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/Makefile.am | 10 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_2peers_1controller.c (renamed from src/testbed/test_testbed_api_2peers.c) | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 5efaef97e..5f149d905 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -71,7 +71,7 @@ libgnunettestbed_la_LDFLAGS = \ | |||
71 | check_PROGRAMS = \ | 71 | check_PROGRAMS = \ |
72 | test_testbed_api_hosts \ | 72 | test_testbed_api_hosts \ |
73 | test_testbed_api_controllerlink \ | 73 | test_testbed_api_controllerlink \ |
74 | test_testbed_api_2peers \ | 74 | test_testbed_api_2peers_1controller \ |
75 | test_testbed_api \ | 75 | test_testbed_api \ |
76 | test_testbed_api_operations \ | 76 | test_testbed_api_operations \ |
77 | test_testbed_api_testbed_run \ | 77 | test_testbed_api_testbed_run \ |
@@ -82,7 +82,7 @@ if ENABLE_TEST_RUN | |||
82 | TESTS = \ | 82 | TESTS = \ |
83 | test_testbed_api \ | 83 | test_testbed_api \ |
84 | test_testbed_api_hosts \ | 84 | test_testbed_api_hosts \ |
85 | test_testbed_api_2peers \ | 85 | test_testbed_api_2peers_1controller \ |
86 | test_testbed_api_operations \ | 86 | test_testbed_api_operations \ |
87 | test_gnunet_helper_testbed \ | 87 | test_gnunet_helper_testbed \ |
88 | test_testbed_api_controllerlink \ | 88 | test_testbed_api_controllerlink \ |
@@ -104,9 +104,9 @@ test_testbed_api_LDADD = \ | |||
104 | $(top_builddir)/src/dht/libgnunetdht.la \ | 104 | $(top_builddir)/src/dht/libgnunetdht.la \ |
105 | libgnunettestbed.la | 105 | libgnunettestbed.la |
106 | 106 | ||
107 | test_testbed_api_2peers_SOURCES = \ | 107 | test_testbed_api_2peers_1controller_SOURCES = \ |
108 | test_testbed_api_2peers.c | 108 | test_testbed_api_2peers_1controller.c |
109 | test_testbed_api_2peers_LDADD = \ | 109 | test_testbed_api_2peers_1controller_LDADD = \ |
110 | $(top_builddir)/src/util/libgnunetutil.la \ | 110 | $(top_builddir)/src/util/libgnunetutil.la \ |
111 | $(top_builddir)/src/testing/libgnunettesting.la \ | 111 | $(top_builddir)/src/testing/libgnunettesting.la \ |
112 | libgnunettestbed.la | 112 | libgnunettestbed.la |
diff --git a/src/testbed/test_testbed_api_2peers.c b/src/testbed/test_testbed_api_2peers_1controller.c index 25ae251d9..0e1f83e98 100644 --- a/src/testbed/test_testbed_api_2peers.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c | |||
@@ -19,9 +19,9 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testbed/test_testbed_api_2peers.c | 22 | * @file testbed/test_testbed_api_2peers_1controller.c |
23 | * @brief testcases for the testbed api: 2 peers are configured, started and | 23 | * @brief testcases for the testbed api: 2 peers are configured, started and |
24 | * connected together | 24 | * connected together. The 2 peer reside on a single controller. |
25 | * @author Sree Harsha Totakura | 25 | * @author Sree Harsha Totakura |
26 | */ | 26 | */ |
27 | 27 | ||
@@ -491,7 +491,7 @@ main (int argc, char **argv) | |||
491 | { | 491 | { |
492 | int ret; | 492 | int ret; |
493 | 493 | ||
494 | char *const argv2[] = { "test_testbed_api_2peers", | 494 | char *const argv2[] = { "test_testbed_api_2peers_1controller", |
495 | "-c", "test_testbed_api.conf", | 495 | "-c", "test_testbed_api.conf", |
496 | NULL | 496 | NULL |
497 | }; | 497 | }; |
@@ -501,11 +501,11 @@ main (int argc, char **argv) | |||
501 | result = INIT; | 501 | result = INIT; |
502 | ret = | 502 | ret = |
503 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, | 503 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
504 | "test_testbed_api_2peers", "nohelp", options, &run, | 504 | "test_testbed_api_2peers_1controller", "nohelp", |
505 | NULL); | 505 | options, &run, NULL); |
506 | if ((GNUNET_OK != ret) || (SUCCESS != result)) | 506 | if ((GNUNET_OK != ret) || (SUCCESS != result)) |
507 | return 1; | 507 | return 1; |
508 | return 0; | 508 | return 0; |
509 | } | 509 | } |
510 | 510 | ||
511 | /* end of test_testbed_api_2peers.c */ | 511 | /* end of test_testbed_api_2peers_1controller.c */ |