diff options
| author | maya <maya@NetBSD.org> | 2018-12-14 23:57:22 +0000 |
|---|---|---|
| committer | maya <maya@NetBSD.org> | 2018-12-14 23:57:22 +0000 |
| commit | 81aa82c37df0c98a3911d58ef2414e8b2e2fbc4b (patch) | |
| tree | 88de3af93d64e61919e7787bcf6a46fdd42951c5 /libexec/httpd | |
| parent | dccc2c6f3fa2ed5b3e7d72049fa63e79613fe1ab (diff) | |
Don't pass ${HOST} to test scripts.
htnl_cmp compares against the output of `hostname`.
This makes the tests pass on my machine.
Diffstat (limited to 'libexec/httpd')
| -rw-r--r-- | libexec/httpd/testsuite/Makefile | 7 | ||||
| -rwxr-xr-x | libexec/httpd/testsuite/test-bigfile | 3 | ||||
| -rwxr-xr-x | libexec/httpd/testsuite/test-simple | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/libexec/httpd/testsuite/Makefile b/libexec/httpd/testsuite/Makefile index 4cf3071592a..ac2e967844b 100644 --- a/libexec/httpd/testsuite/Makefile +++ b/libexec/httpd/testsuite/Makefile @@ -9,7 +9,6 @@ BOZOHTTPD?= ../debug/bozohttpd-debug WGET?= wget DATA?= $(.CURDIR)/data VERBOSE?= yes -HOST?= test.eterna .if ${VERBOSE} != "yes" SILENT= @ @@ -28,17 +27,17 @@ check: check-simple check-cgi check-bigfile 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 --git a/libexec/httpd/testsuite/test-bigfile b/libexec/httpd/testsuite/test-bigfile index 5c451c602c2..943f1806bb5 100755 --- a/libexec/httpd/testsuite/test-bigfile +++ b/libexec/httpd/testsuite/test-bigfile @@ -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 --git a/libexec/httpd/testsuite/test-simple b/libexec/httpd/testsuite/test-simple index 788b7c7f337..200b09f7de4 100755 --- a/libexec/httpd/testsuite/test-simple +++ b/libexec/httpd/testsuite/test-simple @@ -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 @@ fi bozotestport=11111 -${bozohttpd} "$@" "${datadir}" "${host}" < "$in" > "$tmpout" +${bozohttpd} "$@" "${datadir}" < "$in" > "$tmpout" if "$curdir/html_cmp" cmp "$out" "$tmpout"; then exit 0 else |
