diff options
| author | nikita <nikita@n0.is> | 2020-04-30 14:57:43 +0200 |
|---|---|---|
| committer | nikita <nikita@n0.is> | 2020-04-30 14:57:43 +0200 |
| commit | e78a29c1d7e4c0d9d5d2400f8935fe6c6db9852e (patch) | |
| tree | fcebec99976dae264a75fccabd555af2ac77b4ad /tests/libtest/test.h | |
| parent | 55ddc65827f8424ef1c6fe592da07608237cf2ae (diff) | |
| parent | 53cdc2c963e33bc0cc1a51ad2df79396202e07f8 (diff) | |
| download | gnurl-e78a29c1d7e4c0d9d5d2400f8935fe6c6db9852e.tar.gz gnurl-e78a29c1d7e4c0d9d5d2400f8935fe6c6db9852e.tar.bz2 gnurl-e78a29c1d7e4c0d9d5d2400f8935fe6c6db9852e.zip | |
Merge tag 'curl-7_70_0'
7.70.0
Diffstat (limited to 'tests/libtest/test.h')
| -rw-r--r-- | tests/libtest/test.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/libtest/test.h b/tests/libtest/test.h index ff143c985..8aba00f46 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,6 +36,8 @@ #ifdef HAVE_SYS_SELECT_H /* since so many tests use select(), we can just as well include it here */ #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifdef TPF @@ -44,11 +46,13 @@ #include "curl_printf.h" -#define test_setopt(A,B,C) \ - if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup +#define test_setopt(A,B,C) \ + if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) \ + goto test_cleanup -#define test_multi_setopt(A,B,C) \ - if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK) goto test_cleanup +#define test_multi_setopt(A,B,C) \ + if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK) \ + goto test_cleanup extern char *libtest_arg2; /* set by first.c to the argv[2] or NULL */ extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */ |