diff options
Diffstat (limited to 'tests/unittests')
-rw-r--r-- | tests/unittests/torture_buffer.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_callbacks.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_channel.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_init.c | 4 | ||||
-rw-r--r-- | tests/unittests/torture_isipaddr.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_keyfiles.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_list.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_misc.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_options.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_pki.c | 3 | ||||
-rw-r--r-- | tests/unittests/torture_rand.c | 3 |
11 files changed, 22 insertions, 12 deletions
diff --git a/tests/unittests/torture_buffer.c b/tests/unittests/torture_buffer.c index ec87259d..0934cbf1 100644 --- a/tests/unittests/torture_buffer.c +++ b/tests/unittests/torture_buffer.c @@ -250,7 +250,7 @@ static void torture_buffer_pack_badformat(void **state){ int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test_setup_teardown(torture_growing_buffer, setup, teardown), unit_test_setup_teardown(torture_growing_buffer_shifting, setup, teardown), unit_test_setup_teardown(torture_buffer_prepend, setup, teardown), @@ -262,6 +262,7 @@ int torture_run_tests(void) { }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_callbacks.c b/tests/unittests/torture_callbacks.c index 3c836b79..0fdeb3d4 100644 --- a/tests/unittests/torture_callbacks.c +++ b/tests/unittests/torture_callbacks.c @@ -98,13 +98,14 @@ static void torture_log_callback(void **state) int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test_setup_teardown(torture_callbacks_size, setup, teardown), unit_test_setup_teardown(torture_callbacks_exists, setup, teardown), unit_test(torture_log_callback), }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_channel.c b/tests/unittests/torture_channel.c index 1d928b84..a5819d8d 100644 --- a/tests/unittests/torture_channel.c +++ b/tests/unittests/torture_channel.c @@ -37,11 +37,12 @@ static void torture_channel_select(void **state) int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_channel_select), }; ssh_init(); + torture_filter_tests(tests); rc = run_tests(tests); ssh_finalize(); diff --git a/tests/unittests/torture_init.c b/tests/unittests/torture_init.c index 85bd95e1..b608c04f 100644 --- a/tests/unittests/torture_init.c +++ b/tests/unittests/torture_init.c @@ -15,9 +15,9 @@ static void torture_ssh_init(void **state) { } int torture_run_tests(void) { - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_ssh_init), }; - + torture_filter_tests(tests); return run_tests(tests); } diff --git a/tests/unittests/torture_isipaddr.c b/tests/unittests/torture_isipaddr.c index c2a1e079..258082ea 100644 --- a/tests/unittests/torture_isipaddr.c +++ b/tests/unittests/torture_isipaddr.c @@ -45,11 +45,12 @@ static void torture_ssh_is_ipaddr(void **state) { int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_ssh_is_ipaddr) }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_keyfiles.c b/tests/unittests/torture_keyfiles.c index 9446bc6d..b1d88c5f 100644 --- a/tests/unittests/torture_keyfiles.c +++ b/tests/unittests/torture_keyfiles.c @@ -240,7 +240,7 @@ static void torture_privatekey_from_file_passphrase(void **state) { int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test_setup_teardown(torture_pubkey_from_file, setup_rsa_key, teardown), @@ -255,6 +255,7 @@ int torture_run_tests(void) { ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_list.c b/tests/unittests/torture_list.c index 75f41825..09031699 100644 --- a/tests/unittests/torture_list.c +++ b/tests/unittests/torture_list.c @@ -78,13 +78,14 @@ static void torture_ssh_list_prepend(void **state) { int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_ssh_list_new), unit_test(torture_ssh_list_append), unit_test(torture_ssh_list_prepend), }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_misc.c b/tests/unittests/torture_misc.c index 26770324..ad772450 100644 --- a/tests/unittests/torture_misc.c +++ b/tests/unittests/torture_misc.c @@ -187,7 +187,7 @@ static void torture_timeout_update(void **state){ int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_get_user_home_dir), unit_test(torture_basename), unit_test(torture_dirname), @@ -204,6 +204,7 @@ int torture_run_tests(void) { }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_options.c b/tests/unittests/torture_options.c index 6f5df1bb..9653fa21 100644 --- a/tests/unittests/torture_options.c +++ b/tests/unittests/torture_options.c @@ -195,7 +195,7 @@ static void torture_options_proxycommand(void **state) { int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test_setup_teardown(torture_options_set_host, setup, teardown), unit_test_setup_teardown(torture_options_get_host, setup, teardown), unit_test_setup_teardown(torture_options_set_port, setup, teardown), @@ -209,6 +209,7 @@ int torture_run_tests(void) { }; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_pki.c b/tests/unittests/torture_pki.c index 01cf79db..027322a5 100644 --- a/tests/unittests/torture_pki.c +++ b/tests/unittests/torture_pki.c @@ -1437,7 +1437,7 @@ static void torture_pki_ecdsa_name521(void **state) int torture_run_tests(void) { int rc; - const UnitTest tests[] = { + UnitTest tests[] = { unit_test(torture_pki_keytype), unit_test(torture_pki_signature), @@ -1607,6 +1607,7 @@ int torture_run_tests(void) { (void)setup_both_keys; ssh_init(); + torture_filter_tests(tests); rc=run_tests(tests); ssh_finalize(); return rc; diff --git a/tests/unittests/torture_rand.c b/tests/unittests/torture_rand.c index 829989b0..b69201a1 100644 --- a/tests/unittests/torture_rand.c +++ b/tests/unittests/torture_rand.c @@ -60,9 +60,10 @@ static void torture_rand_threading(void **state) { } int torture_run_tests(void) { - const UnitTest tests[] = { + UnitTest tests[] = { unit_test_setup_teardown(torture_rand_threading, setup, teardown), }; + torture_filter_tests(tests); return run_tests(tests); } |