Some tests were using functions curlx_tvnow and curlx_tvdiff which are not

part of the official libcurl API http://curl.haxx.se/lxr/source/lib/README.curlx
The documented way of using them would be to use timeval.c as a source code file.

The above described method works very well when statically linking libcurl and
apps, test programs, but has several drawbacks when you build a true shared
libcurl (i.e. Name space clash at linkage stage as functions are defined more
than once. Windows makefiles are not capable of handling this system of
source-level sharing)

So...

Now testutil.h and testutil.c define and implement tutil_tvnow and tutil_tvdiff
which replace curlx_tvnow and curlx_tvdiff for the libtest programs. Doing this
we avoid the above described problems, and the code in the testsuite does not
impose the need to keep those functions public in libcurl even when not part of
the API.

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 775468da0..499b9e985 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -12,7 +12,7 @@
 
 #include <sys/types.h>
 
-#include "timeval.h"
+#include "testutil.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     300 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 120 * 1000
@@ -74,7 +74,7 @@ int test(char *URL)
   }
 
   ml_timedout = FALSE;
-  ml_start = curlx_tvnow();
+  ml_start = tutil_tvnow();
 
   while (!done) {
     struct timeval interval;
@@ -82,13 +82,13 @@ int test(char *URL)
     interval.tv_sec = 1;
     interval.tv_usec = 0;
 
-    if (curlx_tvdiff(curlx_tvnow(), ml_start) >
+    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
         MAIN_LOOP_HANG_TIMEOUT) {
       ml_timedout = TRUE;
       break;
     }
     mp_timedout = FALSE;
-    mp_start = curlx_tvnow();
+    mp_start = tutil_tvnow();
 
     fprintf(stderr, "curl_multi_perform()\n");
 
@@ -96,7 +96,7 @@ int test(char *URL)
 
     while (res == CURLM_CALL_MULTI_PERFORM) {
       res = curl_multi_perform(m, &running);
-      if (curlx_tvdiff(curlx_tvnow(), mp_start) >
+      if (tutil_tvdiff(tutil_tvnow(), mp_start) >
           MULTI_PERFORM_HANG_TIMEOUT) {
         mp_timedout = TRUE;
         break;