Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/libexec/httpd/testsuite Don't pass ${HOST} to test scripts.
details: https://anonhg.NetBSD.org/src/rev/d6ced674f873
branches: trunk
changeset: 446700:d6ced674f873
user: maya <maya%NetBSD.org@localhost>
date: Fri Dec 14 23:57:22 2018 +0000
description:
Don't pass ${HOST} to test scripts.
htnl_cmp compares against the output of `hostname`.
This makes the tests pass on my machine.
diffstat:
libexec/httpd/testsuite/Makefile | 7 +++----
libexec/httpd/testsuite/test-bigfile | 3 +--
libexec/httpd/testsuite/test-simple | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diffs (75 lines):
diff -r 61d1a570e8f6 -r d6ced674f873 libexec/httpd/testsuite/Makefile
--- a/libexec/httpd/testsuite/Makefile Fri Dec 14 23:42:39 2018 +0000
+++ b/libexec/httpd/testsuite/Makefile Fri Dec 14 23:57:22 2018 +0000
@@ -9,7 +9,6 @@
WGET?= wget
DATA?= $(.CURDIR)/data
VERBOSE?= yes
-HOST?= test.eterna
.if ${VERBOSE} != "yes"
SILENT= @
@@ -28,17 +27,17 @@
check-simple:
.for a in $(SIMPLETESTS)
- ${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}" "${HOST}"
+ ${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}"
.endfor
check-cgi:
.for a in $(CGITESTS)
- ${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}" "${HOST}" -c "${.CURDIR}/cgi-bin"
+ ${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}" -c "${.CURDIR}/cgi-bin"
.endfor
check-bigfile:
.for a in $(BIGFILETESTS)
- ${SILENT}$(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "${DATA}" "${VERBOSE}" "${HOST}"
+ ${SILENT}$(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "${DATA}" "${VERBOSE}"
.endfor
.include <bsd.obj.mk>
diff -r 61d1a570e8f6 -r d6ced674f873 libexec/httpd/testsuite/test-bigfile
--- a/libexec/httpd/testsuite/test-bigfile Fri Dec 14 23:42:39 2018 +0000
+++ b/libexec/httpd/testsuite/test-bigfile Fri Dec 14 23:57:22 2018 +0000
@@ -1,12 +1,11 @@
#! /bin/sh
-# $NetBSD: test-bigfile,v 1.5 2018/11/21 09:37:02 mrg Exp $
+# $NetBSD: test-bigfile,v 1.6 2018/12/14 23:57:22 maya Exp $
test="$1"; shift # partial4000 or partial8000
bozohttpd="$1"; shift
wget="$1"; shift
datadir="$1"; shift
verbose="$1"; shift
-host="$1"; shift
tmperr="tmp.$test.err"
diff -r 61d1a570e8f6 -r d6ced674f873 libexec/httpd/testsuite/test-simple
--- a/libexec/httpd/testsuite/test-simple Fri Dec 14 23:42:39 2018 +0000
+++ b/libexec/httpd/testsuite/test-simple Fri Dec 14 23:57:22 2018 +0000
@@ -1,12 +1,11 @@
#! /bin/sh
-# $NetBSD: test-simple,v 1.5 2018/11/21 09:37:02 mrg Exp $
+# $NetBSD: test-simple,v 1.6 2018/12/14 23:57:22 maya Exp $
test="$1"; shift
bozohttpd="$1"; shift
datadir="$1"; shift
curdir="$1"; shift
verbose="$1"; shift
-host="$1"; shift
in="$curdir/$test.in"
out="$curdir/$test.out"
@@ -21,7 +20,7 @@
bozotestport=11111
-${bozohttpd} "$@" "${datadir}" "${host}" < "$in" > "$tmpout"
+${bozohttpd} "$@" "${datadir}" < "$in" > "$tmpout"
if "$curdir/html_cmp" cmp "$out" "$tmpout"; then
exit 0
else
Home |
Main Index |
Thread Index |
Old Index