From 1f878aee69bf5ec91d71e88d4f1987141978ec5f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 17 May 2005 10:27:11 +0000 Subject: [PATCH] Made test case 241 precheck that the given name resolves to an ipv6 address, or the test is skipped. Ideally, we should let this test case go over a few frequently used IPv6 localhost aliases... --- tests/data/test241 | 3 +++ tests/runtests.pl | 1 + tests/server/resolve.c | 9 +++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/data/test241 b/tests/data/test241 index e1a1ebba2..161c6263f 100644 --- a/tests/data/test241 +++ b/tests/data/test241 @@ -26,6 +26,9 @@ HTTP-IPv6 GET (using ip6-localhost) -g "http://ip6-localhost:%HTTP6PORT/241" + +./server/resolve --ipv6 ip6-localhost + # diff --git a/tests/runtests.pl b/tests/runtests.pl index eec07406f..0ba5d8bc1 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1058,6 +1058,7 @@ sub singletest { chomp $why; } } + print "prechecked $cmd\n" if($verbose); } if($why) { diff --git a/tests/server/resolve.c b/tests/server/resolve.c index e1b75e359..84b369e6b 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -125,8 +125,8 @@ int main(int argc, char *argv[]) he = gethostbyname(host); - printf("Resolve '%s' %s\n", - host, he?"SUCCESSFUL":"FAILED"); + if(!he) + printf("Resolving '%s' FAILED\n", host); return he?0:1; } @@ -143,8 +143,9 @@ int main(int argc, char *argv[]) hints.ai_flags = AI_CANONNAME; rc = (getaddrinfo)(host, "80", &hints, &ai); - printf("Resolve '%s' %s\n", - host, !rc?"SUCCESSFUL":"FAILED"); + if(rc) + printf("Resolving '%s' FAILED\n", host); + return !rc?0:1; } #endif