diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-01-30 21:18:25 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-01-30 21:18:25 +0000 |
| commit | b58e4d89c8d149b25a11c7a80c7f5c2feed20148 (patch) | |
| tree | 608ce131b17866543596051860c5d3ee1d82c92b /regress/usr.sbin/httpd | |
| parent | a8e1b6f6ab123513ccd4086b527c78b65fb36f80 (diff) | |
Fix TLS tests. Keys and log files are now in obj, not in obj/htdocs
Diffstat (limited to 'regress/usr.sbin/httpd')
| -rw-r--r-- | regress/usr.sbin/httpd/tests/Httpd.pm | 5 | ||||
| -rw-r--r-- | regress/usr.sbin/httpd/tests/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/regress/usr.sbin/httpd/tests/Httpd.pm b/regress/usr.sbin/httpd/tests/Httpd.pm index d5b9df0b554..485ff689bfc 100644 --- a/regress/usr.sbin/httpd/tests/Httpd.pm +++ b/regress/usr.sbin/httpd/tests/Httpd.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Httpd.pm,v 1.1 2015/07/16 16:35:57 reyk Exp $ +# $OpenBSD: Httpd.pm,v 1.2 2017/01/30 21:18:24 reyk Exp $ # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org> # Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -27,6 +27,7 @@ sub new { my $class = shift; my %args = @_; $args{chroot} ||= "."; + $args{docroot} ||= "htdocs"; $args{logfile} ||= $args{chroot}."/httpd.log"; $args{up} ||= $args{dryrun} || "server_launch: "; $args{down} ||= $args{dryrun} ? "httpd.conf:" : "parent terminating"; @@ -54,7 +55,7 @@ sub new { my $listenport = $self->{listenport}; print $fh "prefork 1\n"; # only crashes of first child are observed - print $fh "chroot \"".$args{chroot}."\"\n"; + print $fh "chroot \"".$args{docroot}."\"\n"; print $fh "logdir \"".$args{chroot}."\"\n"; my @http = @{$self->{http}}; diff --git a/regress/usr.sbin/httpd/tests/Makefile b/regress/usr.sbin/httpd/tests/Makefile index f6cb6054531..fb93c9d74ee 100644 --- a/regress/usr.sbin/httpd/tests/Makefile +++ b/regress/usr.sbin/httpd/tests/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2017/01/30 18:25:11 reyk Exp $ +# $OpenBSD: Makefile,v 1.7 2017/01/30 21:18:24 reyk Exp $ # The following ports must be installed for the regression tests: # p5-IO-Socket-INET6 object interface for AF_INET and AF_INET6 domain sockets @@ -51,7 +51,7 @@ PERLPATH = ${.CURDIR}/ .for a in ${ARGS} run-regress-$a: ${HTDOCS} $a ${HTDOCS_MD5} @echo '\n======== $@ ========' - time SUDO=${SUDO} KTRACE=${KTRACE} HTTPD=${HTTPD} perl ${PERLINC} ${PERLPATH}httpd.pl ${HTDOCS} ${PERLPATH}$a + time SUDO=${SUDO} KTRACE=${KTRACE} HTTPD=${HTTPD} perl ${PERLINC} ${PERLPATH}httpd.pl ${.OBJDIR} ${PERLPATH}$a .endfor # htdocs |