[src/trunk]: src/libexec/httpd/testsuite fix running the testsuite from the b...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0523355bba06
branches:  trunk
changeset: 812682:0523355bba06
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 27 07:43:39 2015 +0000

description:
fix running the testsuite from the build tree

diffstat:

 libexec/httpd/testsuite/Makefile     |  6 +++---
 libexec/httpd/testsuite/test-bigfile |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 17a6c52bc605 -r 0523355bba06 libexec/httpd/testsuite/Makefile
--- a/libexec/httpd/testsuite/Makefile  Sun Dec 27 06:53:48 2015 +0000
+++ b/libexec/httpd/testsuite/Makefile  Sun Dec 27 07:43:39 2015 +0000
@@ -6,7 +6,7 @@
 BOZOHTTPD?=    ../bozohttpd
 BOZOHTTPD?=    ../debug/bozohttpd-debug
 WGET?=         wget
-
+DATA?=         $(.CURDIR)/data 
 all:
 
 clean:
@@ -19,14 +19,14 @@
 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>
diff -r 17a6c52bc605 -r 0523355bba06 libexec/httpd/testsuite/test-bigfile
--- a/libexec/httpd/testsuite/test-bigfile      Sun Dec 27 06:53:48 2015 +0000
+++ b/libexec/httpd/testsuite/test-bigfile      Sun Dec 27 07:43:39 2015 +0000
@@ -8,7 +8,7 @@
 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 @@
 
 kill -9 $bozopid
 
-if cmp ./bigfile ./data/bigfile; then
+if cmp ./bigfile ${datadir}/bigfile; then
        rm -f ./bigfile
        exit 0
 else