summaryrefslogtreecommitdiff
path: root/tests/server-auth-test.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-02-17 22:29:44 -0500
committerDan Winship <danw@gnome.org>2014-02-17 22:35:04 -0500
commit2b0de6b7de7537c7d36ab33a7e5cf0e274ea3e23 (patch)
tree23fac5bb11876b8b5701e4d1e4d25ac05414d32f /tests/server-auth-test.c
parenta70ea67ade04ffc8048c93308d88ae70028dcf38 (diff)
downloadlibsoup-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/server-auth-test.c')
-rw-r--r--tests/server-auth-test.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/server-auth-test.c b/tests/server-auth-test.c
index 77a5dba1..b5580c82 100644
--- a/tests/server-auth-test.c
+++ b/tests/server-auth-test.c
@@ -5,8 +5,6 @@
#include "test-utils.h"
-#ifdef HAVE_CURL
-
static struct {
gboolean client_sent_basic, client_sent_digest;
gboolean server_requested_basic, server_requested_digest;
@@ -106,6 +104,11 @@ do_auth_tests (gconstpointer data)
gboolean use_basic, use_digest, good_user, good_password;
gboolean preemptive_basic, good_auth;
+#ifndef HAVE_CURL
+ g_test_skip ("/usr/bin/curl is not available");
+ return;
+#endif
+
for (i = 0; i < 16; i++) {
use_basic = (i & 1) == 1;
use_digest = (i & 2) == 2;
@@ -344,13 +347,3 @@ main (int argc, char **argv)
test_cleanup ();
return ret;
}
-
-#else /* HAVE_CURL */
-
-int
-main (int argc, char **argv)
-{
- return 77; /* SKIP */
-}
-
-#endif