Skip to content

Commit f018ae6

Browse files
mattmundellnichtsfrei
authored andcommitted
Fix: Tests: always free suite
1 parent 4b5182b commit f018ae6

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

misc/ipc_openvas_tests.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ Ensure (ipc_openvas, ipc_data_from_json_parse_many_objects)
150150
int
151151
main (int argc, char **argv)
152152
{
153+
int ret;
153154
TestSuite *suite;
154155

155156
suite = create_test_suite ();
@@ -161,7 +162,11 @@ main (int argc, char **argv)
161162
ipc_data_from_json_parse_many_objects);
162163

163164
if (argc > 1)
164-
return run_single_test (suite, argv[1], create_text_reporter ());
165+
ret = run_single_test (suite, argv[1], create_text_reporter ());
166+
else
167+
ret = run_test_suite (suite, create_text_reporter ());
165168

166-
return run_test_suite (suite, create_text_reporter ());
169+
destroy_test_suite (suite);
170+
171+
return ret;
167172
}

misc/pcap_tests.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,18 @@ openvas_routethrough ()
299299
int
300300
main (int argc, char **argv)
301301
{
302+
int ret;
302303
TestSuite *suite;
303304

304305
suite = create_test_suite ();
305306
add_suite (suite, openvas_routethrough ());
306307

307308
if (argc > 1)
308-
return run_single_test (suite, argv[1], create_text_reporter ());
309+
ret = run_single_test (suite, argv[1], create_text_reporter ());
310+
else
311+
ret = run_test_suite (suite, create_text_reporter ());
309312

310-
return run_test_suite (suite, create_text_reporter ());
313+
destroy_test_suite (suite);
314+
315+
return ret;
311316
}

misc/table_driven_lsc_tests.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,19 @@ Ensure (lsc, process_resp)
9292
int
9393
main (int argc, char **argv)
9494
{
95+
int ret;
9596
TestSuite *suite;
9697

9798
suite = create_test_suite ();
9899

99100
add_test_with_context (suite, lsc, process_resp);
100101
add_test_with_context (suite, lsc, make_pkg_in_json);
101102
if (argc > 1)
102-
return run_single_test (suite, argv[1], create_text_reporter ());
103+
ret = run_single_test (suite, argv[1], create_text_reporter ());
104+
else
105+
ret = run_test_suite (suite, create_text_reporter ());
103106

104-
return run_test_suite (suite, create_text_reporter ());
107+
destroy_test_suite (suite);
108+
109+
return ret;
105110
}

src/attack_tests.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Ensure (attack, comm_send_status_sends_correct_text)
102102
int
103103
main (int argc, char **argv)
104104
{
105+
int ret;
105106
TestSuite *suite;
106107

107108
suite = create_test_suite ();
@@ -113,7 +114,11 @@ main (int argc, char **argv)
113114
add_test_with_context (suite, attack, comm_send_status_sends_correct_text);
114115

115116
if (argc > 1)
116-
return run_single_test (suite, argv[1], create_text_reporter ());
117+
ret = run_single_test (suite, argv[1], create_text_reporter ());
118+
else
119+
ret = run_test_suite (suite, create_text_reporter ());
117120

118-
return run_test_suite (suite, create_text_reporter ());
121+
destroy_test_suite (suite);
122+
123+
return ret;
119124
}

0 commit comments

Comments
 (0)