Module Name: src
Committed By: mrg
Date: Sun Dec 27 07:43:39 UTC 2015
Modified Files:
src/libexec/httpd/testsuite: Makefile test-bigfile
Log Message:
fix running the testsuite from the build tree
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/libexec/httpd/testsuite/test-bigfile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/testsuite/Makefile
diff -u src/libexec/httpd/testsuite/Makefile:1.4 src/libexec/httpd/testsuite/Makefile:1.5
--- src/libexec/httpd/testsuite/Makefile:1.4 Sat May 23 02:26:03 2009
+++ src/libexec/httpd/testsuite/Makefile Sun Dec 27 07:43:39 2015
@@ -6,7 +6,7 @@ BIGFILETESTS= partial4000 partial8000
BOZOHTTPD?= ../bozohttpd
BOZOHTTPD?= ../debug/bozohttpd-debug
WGET?= wget
-
+DATA?= $(.CURDIR)/data
all:
clean:
@@ -19,14 +19,14 @@ check: check-simple check-bigfile
check-simple:
.for a in $(SIMPLETESTS)
echo "Running test $a"
- $(BOZOHTTPD) ./data < $(.CURDIR)/$a.in > tmp.$a.out || true
+ $(BOZOHTTPD) "$(DATA)" < $(.CURDIR)/$a.in > tmp.$a.out || true
$(.CURDIR)/html_cmp $(.CURDIR)/$a.out tmp.$a.out
.endfor
check-bigfile:
.for a in $(BIGFILETESTS)
echo "Running test $a"
- $(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "./data"
+ $(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "$(DATA)"
.endfor
.include <bsd.obj.mk>
Index: src/libexec/httpd/testsuite/test-bigfile
diff -u src/libexec/httpd/testsuite/test-bigfile:1.1.1.1 src/libexec/httpd/testsuite/test-bigfile:1.2
--- src/libexec/httpd/testsuite/test-bigfile:1.1.1.1 Sat May 23 02:21:19 2009
+++ src/libexec/httpd/testsuite/test-bigfile Sun Dec 27 07:43:39 2015
@@ -8,7 +8,7 @@ datadir="$4"
bozotestport=11111
# copy beginning file
-cp ./data/bigfile.${test} ./bigfile
+cp ${datadir}/bigfile.${test} ./bigfile
# fire up bozohttpd
${bozohttpd} -b -b -I ${bozotestport} -n -s -f ${datadir} &
@@ -18,7 +18,7 @@ ${wget} -c http://localhost:${bozotestpo
kill -9 $bozopid
-if cmp ./bigfile ./data/bigfile; then
+if cmp ./bigfile ${datadir}/bigfile; then
rm -f ./bigfile
exit 0
else
