test2600: disable on win32

- disbable this test on WIN32 platforms. It uses the file describtor '1'
  as valid socket without events. Not portable.
- reduce trace output somewhat on other runs

Fixes #14177
Reported-by: Viktor Szakats
Closes #14191

diff --git a/tests/data/test2600 b/tests/data/test2600
index 5b88aedb7da9fc19d4f29f00cfabd7d410091613..10109d1e1905e979b62b162b4cbea7985588153a 100644 (file)
--- a/tests/data/test2600
+++ b/tests/data/test2600
@@ -17,6 +17,7 @@ none
 unittest
 debug
 http
+!win32
 </features>
 <name>
 connection filter connect/destroy unit tests

diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index 5c08d07d47aebf4bfc2fe5306f7b5058f7a907c0..5a3def4076467ea71b98265d63d3e28b8e4f3883 100644 (file)
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -47,6 +47,7 @@
 #include "connect.h"
 #include "cfilters.h"
 #include "multiif.h"
+#include "select.h"
 #include "curl_trc.h"
 
 
@@ -62,6 +63,7 @@ static CURLcode unit_setup(void)
     curl_global_cleanup();
     return CURLE_OUT_OF_MEMORY;
   }
+  curl_global_trace("all");
   curl_easy_setopt(easy, CURLOPT_VERBOSE, 1L);
   return res;
 }
@@ -146,8 +148,10 @@ static CURLcode cf_test_connect(struct Curl_cfilter *cf,
           (int)duration_ms, ctx->id);
     return CURLE_COULDNT_CONNECT;
   }
-  if(duration_ms)
+  if(duration_ms) {
     infof(data, "%04dms: cf[%s] continuing", (int)duration_ms, ctx->id);
+    Curl_wait_ms(10);
+  }
   Curl_expire(data, ctx->fail_delay_ms - duration_ms, EXPIRE_RUN_NOW);
   return CURLE_OK;
 }