diff options
| author | Dan Winship <danw@gnome.org> | 2014-02-17 22:29:44 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-02-17 22:35:04 -0500 |
| commit | 2b0de6b7de7537c7d36ab33a7e5cf0e274ea3e23 (patch) | |
| tree | 23fac5bb11876b8b5701e4d1e4d25ac05414d32f /tests/timeout-test.c | |
| parent | a70ea67ade04ffc8048c93308d88ae70028dcf38 (diff) | |
| download | libsoup-2b0de6b7de7537c7d36ab33a7e5cf0e274ea3e23.tar.gz | |
tests: skip individual tests rather than whole test programs
Use g_skip_test() to skip individual tests rather than just returning
status 77 from the test program as a whole.
In several cases, we still end up skipping more than necessary, due to
test cases that need to be split up more.
Remove the "MISSING_REGRESSION_TESTS_PACKAGES" functionality, since
the skipped tests are now pointed out explicitly.
Diffstat (limited to 'tests/timeout-test.c')
| -rw-r--r-- | tests/timeout-test.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/timeout-test.c b/tests/timeout-test.c index fba515db..48c672bf 100644 --- a/tests/timeout-test.c +++ b/tests/timeout-test.c @@ -208,10 +208,7 @@ do_async_timeout_tests (gconstpointer data) gboolean extra_slow; if (g_str_has_prefix (fast_uri, "https")) { - if (!tls_available) { - g_test_skip ("TLS not available"); - return; - } + SOUP_TEST_SKIP_IF_NO_TLS; extra_slow = slow_https; } else @@ -252,10 +249,7 @@ do_sync_timeout_tests (gconstpointer data) gboolean extra_slow; if (g_str_has_prefix (fast_uri, "https")) { - if (!tls_available) { - g_test_skip ("TLS not available"); - return; - } + SOUP_TEST_SKIP_IF_NO_TLS; extra_slow = slow_https; } else @@ -340,7 +334,8 @@ main (int argc, char **argv) debug_printf (2, "\n"); slow_https = FALSE; } - } + } else + https_uri = g_strdup ("https://fail."); g_test_add_data_func ("/timeout/http/async", uri, do_async_timeout_tests); g_test_add_data_func ("/timeout/http/sync", uri, do_sync_timeout_tests); |