aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-08-24 15:21:32 +0200
committerChristian Grothoff <christian@grothoff.org>2021-08-24 15:21:32 +0200
commit5bb46d9a3ab568145f594c5a3cfa31ead3df38eb (patch)
tree021dd56b9a4fd7d349139a844635bb1675b80167 /src/testing
parent5ddaa3f8eb5e01882540f21ddf237f3a41311e8a (diff)
downloadgnunet-5bb46d9a3ab568145f594c5a3cfa31ead3df38eb.tar.gz
gnunet-5bb46d9a3ab568145f594c5a3cfa31ead3df38eb.zip
-remove dead ats-tests, fix strange Debian build issues
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/Makefile.am3
-rw-r--r--src/testing/testing_api_cmd_netjail_start_testsystem.c11
-rw-r--r--src/testing/testing_api_cmd_netjail_stop_testsystem.c5
3 files changed, 11 insertions, 8 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index c01e9bdbd..6e0f29c4e 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -62,9 +62,6 @@ libgnunettesting_la_LIBADD = \
62 $(top_builddir)/src/arm/libgnunetarm.la \ 62 $(top_builddir)/src/arm/libgnunetarm.la \
63 $(top_builddir)/src/util/libgnunetutil.la \ 63 $(top_builddir)/src/util/libgnunetutil.la \
64 $(LTLIBINTL) 64 $(LTLIBINTL)
65libgnunettesting_la_DEPENDENCIES = \
66 $(top_builddir)/src/arm/libgnunetarm.la \
67 $(top_builddir)/src/util/libgnunetutil.la
68libgnunettesting_la_LDFLAGS = \ 65libgnunettesting_la_LDFLAGS = \
69 $(GN_LIB_LDFLAGS) \ 66 $(GN_LIB_LDFLAGS) \
70 -version-info 2:0:1 67 -version-info 2:0:1
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem.c b/src/testing/testing_api_cmd_netjail_start_testsystem.c
index 01bac9b05..0fe0541b0 100644
--- a/src/testing/testing_api_cmd_netjail_start_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -191,7 +191,7 @@ struct TestingSystemCount
191}; 191};
192 192
193/** 193/**
194* Code to clean up ressource this cmd used. 194* Code to clean up resource this cmd used.
195* 195*
196* @param cls closure 196* @param cls closure
197* @param cmd current CMD being cleaned up. 197* @param cmd current CMD being cleaned up.
@@ -276,6 +276,7 @@ GNUNET_TESTING_get_trait_helper_handles (const struct
276 (unsigned int) 0); 276 (unsigned int) 0);
277} 277}
278 278
279
279/** 280/**
280 * Offer messages received via testing cmd helper from trait 281 * Offer messages received via testing cmd helper from trait
281 * 282 *
@@ -362,6 +363,7 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
362 return GNUNET_OK; 363 return GNUNET_OK;
363} 364}
364 365
366
365/** 367/**
366 * Callback called if there was an exception during execution of the helper. 368 * Callback called if there was an exception during execution of the helper.
367 * 369 *
@@ -374,6 +376,7 @@ exp_cb (void *cls)
374 *ns->rv = 1; 376 *ns->rv = 1;
375} 377}
376 378
379
377/** 380/**
378 * Function to initialize a init message for the helper. 381 * Function to initialize a init message for the helper.
379 * 382 *
@@ -506,7 +509,8 @@ netjail_exec_run (void *cls,
506 struct GNUNET_CONFIGURATION_Handle *config = 509 struct GNUNET_CONFIGURATION_Handle *config =
507 GNUNET_CONFIGURATION_create (); 510 GNUNET_CONFIGURATION_create ();
508 511
509 for (int i = 1; i <= atoi (ns->global_n); i++) { 512 for (int i = 1; i <= atoi (ns->global_n); i++)
513 {
510 for (int j = 1; j <= atoi (ns->local_m); j++) 514 for (int j = 1; j <= atoi (ns->local_m); j++)
511 { 515 {
512 sprintf (str_n, "%d", i); 516 sprintf (str_n, "%d", i);
@@ -554,7 +558,8 @@ netjail_start_finish (void *cls,
554 558
555 if (ns->number_of_peers_started == total_number) 559 if (ns->number_of_peers_started == total_number)
556 { 560 {
557 for (int i = 1; i <= atoi (ns->global_n); i++) { 561 for (int i = 1; i <= atoi (ns->global_n); i++)
562 {
558 for (int j = 1; j <= atoi (ns->local_m); j++) 563 for (int j = 1; j <= atoi (ns->local_m); j++)
559 { 564 {
560 tbc = GNUNET_new (struct TestingSystemCount); 565 tbc = GNUNET_new (struct TestingSystemCount);
diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem.c b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
index d6e733e05..0ae82a26a 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -49,7 +49,7 @@ struct StopHelperState
49 49
50 50
51/** 51/**
52* Code to clean up ressource this cmd used. 52* Code to clean up resource this cmd used.
53* 53*
54* @param cls closure 54* @param cls closure
55* @param cmd current CMD being cleaned up. 55* @param cmd current CMD being cleaned up.
@@ -97,7 +97,8 @@ stop_testing_system_run (void *cls,
97 GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd, 97 GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd,
98 &helper); 98 &helper);
99 99
100 for (int i = 1; i <= atoi (shs->global_n); i++) { 100 for (int i = 1; i <= atoi (shs->global_n); i++)
101 {
101 for (int j = 1; j <= atoi (shs->local_m); j++) 102 for (int j = 1; j <= atoi (shs->local_m); j++)
102 { 103 {
103 GNUNET_HELPER_stop (helper[(i - 1) * atoi (shs->local_m) + j - 1], 104 GNUNET_HELPER_stop (helper[(i - 1) * atoi (shs->local_m) + j - 1],