[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 129/151: tests: fix build with `CURL_DISABLE_DOH`
From: |
gnunet |
Subject: |
[gnurl] 129/151: tests: fix build with `CURL_DISABLE_DOH` |
Date: |
Fri, 20 Dec 2019 14:27:18 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 9f239811fdc9881d64fee5f20cdfe3b66e8c2e14
Author: Marcel Raad <address@hidden>
AuthorDate: Mon Dec 9 11:42:26 2019 +0100
tests: fix build with `CURL_DISABLE_DOH`
Closes https://github.com/curl/curl/pull/4692
---
tests/unit/unit1650.c | 4 ++--
tests/unit/unit1655.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c
index cd6f519f7..35ac12c81 100644
--- a/tests/unit/unit1650.c
+++ b/tests/unit/unit1650.c
@@ -33,7 +33,7 @@ static void unit_stop(void)
}
-#ifdef USE_NGHTTP2
+#ifndef CURL_DISABLE_DOH
#define DNS_PREAMBLE "\x00\x00\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00"
#define LABEL_TEST "\x04\x74\x65\x73\x74"
#define LABEL_HOST "\x04\x68\x6f\x73\x74"
@@ -283,7 +283,7 @@ UNITTEST_START
}
UNITTEST_STOP
-#else /* USE_NGHTTP2 */
+#else /* CURL_DISABLE_DOH */
UNITTEST_START
{
return 1; /* nothing to do, just fail */
diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c
index cccaab8da..a06b23a76 100644
--- a/tests/unit/unit1655.c
+++ b/tests/unit/unit1655.c
@@ -34,6 +34,8 @@ static void unit_stop(void)
/* done before shutting down and exiting */
}
+#ifndef CURL_DISABLE_DOH
+
UNITTEST_START
/*
@@ -175,3 +177,13 @@ do {
fail_unless(olen == olen1, "bad buffer length");
} while(0);
UNITTEST_STOP
+
+#else /* CURL_DISABLE_DOH */
+
+UNITTEST_START
+{
+ return 1; /* nothing to do, just fail */
+}
+UNITTEST_STOP
+
+#endif
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 143/151: KNOWN_BUGS: Connection information when using TCP Fast Open, (continued)
- [gnurl] 143/151: KNOWN_BUGS: Connection information when using TCP Fast Open, gnunet, 2019/12/20
- [gnurl] 127/151: azure: make the default build use --enable-debug --enable-werror, gnunet, 2019/12/20
- [gnurl] 131/151: tests: use DoH feature for DoH tests, gnunet, 2019/12/20
- [gnurl] 144/151: KNOWN_BUGS: TLS session cache doesn't work with TFO, gnunet, 2019/12/20
- [gnurl] 140/151: cirrus: Switch to the FreeBSD 12.1 point release & enable more tests., gnunet, 2019/12/20
- [gnurl] 145/151: Revert "checksrc: fix regexp for ASSIGNWITHINCONDITION", gnunet, 2019/12/20
- [gnurl] 122/151: unit1607: fix mem-leak in OOM, gnunet, 2019/12/20
- [gnurl] 134/151: RELEASE-NOTES: synced, gnunet, 2019/12/20
- [gnurl] 139/151: azure: the macos cmake doesn't need to install cmake, gnunet, 2019/12/20
- [gnurl] 137/151: libssh2: add support for ECDSA and ed25519 knownhost keys, gnunet, 2019/12/20
- [gnurl] 129/151: tests: fix build with `CURL_DISABLE_DOH`,
gnunet <=
- [gnurl] 151/151: make gnurl, gnunet, 2019/12/20
- [gnurl] 141/151: docs: TLS SRP doesn't work with TLS 1.3, gnunet, 2019/12/20
- [gnurl] 147/151: lib: remove ASSIGNWITHINCONDITION exceptions, use our code style, gnunet, 2019/12/20
- [gnurl] 146/151: tests: make sure checksrc runs on header files too, gnunet, 2019/12/20
- [gnurl] 150/151: makefile, gnunet, 2019/12/20
- [gnurl] 148/151: define: remove HAVE_ENGINE_LOAD_BUILTIN_ENGINES, not used anymore, gnunet, 2019/12/20
- [gnurl] 149/151: Merge remote-tracking branch 'upstream/master', gnunet, 2019/12/20