tests: fix MSVC unreachable code warnings in unit tests

Switch unit1654 to use the proper test macros as well.

diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c
index a4350c8c102c6bc56226cc34305b8f89d6765074..440b3906026f2fc3eb176e03a21f393772e5c9c9 100644 (file)
--- a/tests/unit/unit1307.c
+++ b/tests/unit/unit1307.c
@@ -316,10 +316,6 @@ UNITTEST_STOP
 #else
 
 UNITTEST_START
-{
-  /* nothing to do, just fail */
-  return 1;
-}
 UNITTEST_STOP
 
 #endif

diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index 0818ea7ed54f90b9509fc426eb8fbdd2ead3d780..ef03e3b4c75fa2b1e14870d2d294870ee4c9c2da 100644 (file)
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -158,9 +158,7 @@ UNITTEST_START
       err++;
     }
   }
-  return err;
+  fail_if(err, "errors");
 }
-#else
-return 0;
 #endif
 UNITTEST_STOP

diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c
index 36529418836a42ef4d54b8ec272ec3ede02f5e71..91aca378ec91e48290029a2852eaa4bcb480029c 100644 (file)
--- a/tests/unit/unit1654.c
+++ b/tests/unit/unit1654.c
@@ -38,105 +38,76 @@ unit_stop(void)
   curl_global_cleanup();
 }
 
-#if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_ALTSVC)
-UNITTEST_START
-{
-  return 0; /* nothing to do when HTTP or alt-svc is disabled */
-}
-UNITTEST_STOP
-#else
 UNITTEST_START
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
 {
   char outname[256];
   CURL *curl;
   CURLcode result;
   struct altsvcinfo *asi = Curl_altsvc_init();
-  if(!asi)
-    return 1;
+  abort_if(!asi, "Curl_altsvc_i");
   result = Curl_altsvc_load(asi, arg);
   if(result) {
-    Curl_altsvc_cleanup(&asi);
-    return result;
+    fail_if(result, "Curl_altsvc_load");
+    goto fail;
   }
   curl_global_init(CURL_GLOBAL_ALL);
   curl = curl_easy_init();
-  if(!curl)
+  if(!curl) {
+    fail_if(!curl, "curl_easy_init");
     goto fail;
+  }
   fail_unless(asi->list.size == 4, "wrong number of entries");
   msnprintf(outname, sizeof(outname), "%s-out", arg);
 
   result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n",
                              ALPN_h1, "example.org", 8080);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse() failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse() failed!");
   fail_unless(asi->list.size == 5, "wrong number of entries");
 
   result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n",
                              ALPN_h1, "2.example.org", 8080);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(2) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(2) failed!");
   fail_unless(asi->list.size == 6, "wrong number of entries");
 
   result = Curl_altsvc_parse(curl, asi,
                              "h2=\"example.com:8080\", h3=\"yesyes.com\"\r\n",
                              ALPN_h1, "3.example.org", 8080);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(3) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(3) failed!");
   /* that one should make two entries */
   fail_unless(asi->list.size == 8, "wrong number of entries");
 
   result = Curl_altsvc_parse(curl, asi,
                              "h2=\"example.com:443\"; ma = 120;\r\n",
                              ALPN_h2, "example.org", 80);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(4) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(4) failed!");
   fail_unless(asi->list.size == 9, "wrong number of entries");
 
   /* quoted 'ma' value */
   result = Curl_altsvc_parse(curl, asi,
                              "h2=\"example.net:443\"; ma=\"180\";\r\n",
                              ALPN_h2, "example.net", 80);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(4) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(4) failed!");
   fail_unless(asi->list.size == 10, "wrong number of entries");
 
   result =
     Curl_altsvc_parse(curl, asi,
                       "h2=\":443\", h3=\":443\"; ma = 120; persist = 1\r\n",
                       ALPN_h1, "curl.se", 80);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(5) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(5) failed!");
   fail_unless(asi->list.size == 12, "wrong number of entries");
 
   /* clear that one again and decrease the counter */
   result = Curl_altsvc_parse(curl, asi, "clear;\r\n",
                              ALPN_h1, "curl.se", 80);
-  if(result) {
-    fprintf(stderr, "Curl_altsvc_parse(6) failed!\n");
-    unitfail++;
-  }
+  fail_if(result, "Curl_altsvc_parse(6) failed!");
   fail_unless(asi->list.size == 10, "wrong number of entries");
 
   Curl_altsvc_save(curl, asi, outname);
 
   curl_easy_cleanup(curl);
-  curl_global_cleanup();
   fail:
   Curl_altsvc_cleanup(&asi);
-  curl_global_cleanup();
-  return unitfail;
 }
-UNITTEST_STOP
 #endif
+UNITTEST_STOP