[tests] _WIN32 adjustments in LightyTest.pm

separate cygwin paths from Windows native paths

6 files changed, 87 insertions, 32 deletions

diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm
index 6d7e9a47..5de3af91 100644
--- a/tests/LightyTest.pm
+++ b/tests/LightyTest.pm
@@ -50,20 +50,17 @@ sub new {
 	my $class = shift;
 	my $self = {};
 	my $lpath;
+	my $exe = $^O eq "cygwin" ? ".exe" : "";
 
 	$self->{CONFIGFILE} = 'lighttpd.conf';
 
 	$lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..');
 	$self->{BASEDIR} = abs_path($lpath);
 
-	$lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'}."/tests/" : '.');
+	$lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'}."/tests" : '.');
 	$self->{TESTDIR} = abs_path($lpath);
 
-	$lpath = (defined $ENV{'srcdir'} ? $ENV{'srcdir'} : '.');
-	$self->{SRCDIR} = abs_path($lpath);
-
-
-	if (mtime($self->{BASEDIR}.'/src/lighttpd') > mtime($self->{BASEDIR}.'/build/lighttpd')) {
+	if (mtime($self->{BASEDIR}."/src/lighttpd$exe") > mtime($self->{BASEDIR}."/build/lighttpd$exe")) {
 		$self->{BINDIR} = $self->{BASEDIR}.'/src';
 		if (mtime($self->{BASEDIR}.'/src/.libs')) {
 			$self->{MODULES_PATH} = $self->{BASEDIR}.'/src/.libs';
@@ -74,7 +71,7 @@ sub new {
 		$self->{BINDIR} = $self->{BASEDIR}.'/build';
 		$self->{MODULES_PATH} = $self->{BASEDIR}.'/build';
 	}
-	$self->{LIGHTTPD_PATH} = $self->{BINDIR}.'/lighttpd';
+	$self->{LIGHTTPD_PATH} = $self->{BINDIR}."/lighttpd$exe";
 	if (exists $ENV{LIGHTTPD_EXE_PATH}) {
 		$self->{LIGHTTPD_PATH} = $ENV{LIGHTTPD_EXE_PATH};
 	}
@@ -115,8 +112,43 @@ sub stop_proc {
 
 	my $pid = $self->{LIGHTTPD_PID};
 	if (defined $pid && $pid != -1) {
-		kill('USR1', $pid) if (($ENV{"TRACEME"}||'') eq 'strace');
-		kill('TERM', $pid) or return -1;
+		if ($self->{"win32native"}) {
+			# kill process tree; not a graceful shutdown of lighttpd or backends
+			#
+			# https://cygwin.com/cygwin-ug-net/kill.html
+			# aside: /bin/kill is not the same as shell builtin kill
+			# Still, lighttpd currently does not appear able to catch
+			# signals from Perl kill() or from /bin/kill, and so the
+			# process tree including backends is not cleaned up; only
+			# lighttpd is killed.
+			# system('/bin/kill', '-s', 'INT', '-f', '-W', $winpid) == 0 or return -1;
+			#
+			# powershell kill -Force -Id $winpid          (same as Stop-Process)
+			# powershell Stop-Process -Force -Id $winpid  (same as kill)
+			# powershell Stop-Process -Force -Name lighttpd.exe
+			#
+			# sysinternal tools
+			# https://docs.microsoft.com/en-us/sysinternals/downloads/pskill
+			#   pskill -nobanner -t $winpid
+			#   pskill -nobanner -t lighttpd.exe
+			#
+			my $winpid = 0;
+			if (open(my $WH, "<", "/proc/$pid/winpid")) {
+				$winpid = <$WH>;
+				chomp($winpid);
+				close($WH);
+			}
+			if ($winpid) {
+				system('/cygdrive/c/windows/system32/taskkill.exe', '/F', '/T', '/PID', $winpid);
+			}
+			else {
+				system('/cygdrive/c/windows/system32/taskkill.exe', '/F', '/T', '/IM', 'lighttpd.exe');
+			}
+		}
+		else {
+			kill('USR1', $pid) if (($ENV{"TRACEME"}||'') eq 'strace');
+			kill('TERM', $pid) or return -1;
+		}
 		return -1 if ($pid != waitpid($pid, 0));
 	} else {
 		diag("\nProcess not started, nothing to stop");
@@ -169,6 +201,16 @@ sub get_ephemeral_tcp_port {
 	return $port;
 }
 
+sub cygpath_alm {
+    my $FH;
+    open($FH, '-|', "cygpath", "-alm", $_[0]) || return $_[0];
+    my $result = <$FH>;
+    close $FH;
+    chomp $result;
+    $result =~ s/^[A-Z]://i; # remove volume (C:)
+    return $result;
+}
+
 sub start_proc {
 	my $self = shift;
 	# kill old proc if necessary
@@ -178,24 +220,37 @@ sub start_proc {
 	my $SOCK;
 	($SOCK, $self->{PORT}) = bind_ephemeral_tcp_socket();
 
-	# pre-process configfile if necessary
-	#
-
-	$ENV{'SRCDIR'} = $self->{BASEDIR}.'/tests';
-	$ENV{'PORT'} = $self->{PORT};
+	my $testdir      = $self->{TESTDIR};
+	my $conf         = $self->{TESTDIR}.'/'.$self->{CONFIGFILE};
+	my $modules_path = $self->{MODULES_PATH};
+
+	# test for cygwin w/ _WIN32 native lighttpd.exe (not linked w/ cygwin1.dll)
+	#   ($^O eq "MSWin32") is untested; not supported
+	my $win32native = $^O eq "cygwin"
+	               && 0 != system("ldd '$$self{LIGHTTPD_PATH}' | grep -q cygwin");
+	$self->{"win32native"} = $win32native;
+
+	if ($win32native) {
+		$ENV{SHELL}         = "/bin/sh";
+		$ENV{PERL}          = cygpath_alm($ENV{PERL});
+		$testdir            = cygpath_alm($testdir);
+		$conf               = cygpath_alm($conf);
+		$modules_path       = cygpath_alm($modules_path);
+	}
 
-	my @cmdline = ($self->{LIGHTTPD_PATH}, "-D", "-f", $self->{SRCDIR}."/".$self->{CONFIGFILE}, "-m", $self->{MODULES_PATH});
+	my @cmdline = ($self->{LIGHTTPD_PATH}, "-D", "-f", $conf, "-m", $modules_path);
 	splice(@cmdline, -2) if exists $ENV{LIGHTTPD_EXE_PATH};
-	if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') {
+	if (!defined $ENV{"TRACEME"}) {
+	} elsif ($ENV{"TRACEME"} eq 'strace') {
 		@cmdline = (qw(strace -tt -s 4096 -o strace -f -v), @cmdline);
-	} elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'truss') {
+	} elsif ($ENV{"TRACEME"} eq 'truss') {
 		@cmdline = (qw(truss -a -l -w all -v all -o strace), @cmdline);
-	} elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'gdb') {
+	} elsif ($ENV{"TRACEME"} eq 'gdb') {
 		@cmdline = ('gdb', '--batch', '--ex', 'run', '--ex', 'bt full', '--args', @cmdline);
-	} elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') {
+	} elsif ($ENV{"TRACEME"} eq 'valgrind') {
 		@cmdline = (qw(valgrind --tool=memcheck --track-origins=yes --show-reachable=yes --leak-check=yes --log-file=valgrind.%p), @cmdline);
 	}
-	# diag("\nstarting lighttpd at :".$self->{PORT}.", cmdline: @cmdline");
+	# diag("\nstarting lighttpd at :$$self{PORT}, cmdline: @cmdline");
 	my $child = fork();
 	if (not defined $child) {
 		diag("\nFork failed");
@@ -203,7 +258,8 @@ sub start_proc {
 		return -1;
 	}
 	if ($child == 0) {
-		if ($^O eq "MSWin32") {
+		$ENV{'SRCDIR'} = $testdir;
+		if ($win32native) {
 			# On platforms where systemd socket activation is not supported
 			# or inconvenient for testing (i.e. cygwin <-> native Windows exe),
 			# there is a race condition with close() before server start,
@@ -211,11 +267,11 @@ sub start_proc {
 			# and the point is to avoid a port which is already in use.
 			close($SOCK);
 			my $CONF;
-			open($CONF,'>',"$ENV{'SRCDIR'}/tmp/bind.conf") || die "open: $!";
+			open($CONF,'>',$self->{TESTDIR}."/tmp/bind.conf") || die "open: $!";
 			print $CONF <<BIND_OVERRIDE;
 server.systemd-socket-activation := "disable"
 server.bind = "127.0.0.1"
-server.port = $ENV{'PORT'}
+server.port = $$self{'PORT'}
 BIND_OVERRIDE
 		}
 		else {
@@ -236,6 +292,7 @@ BIND_OVERRIDE
 				fcntl($SOCK, Fcntl::F_SETFD(), 0); # clr FD_CLOEXEC
 			}
 		}
+		#diag(sprintf('\ncmd: %s', "@cmdline"));
 		exec @cmdline or die($?);
 	}
 	close($SOCK);
diff --git a/tests/fastcgi-responder.conf b/tests/fastcgi-responder.conf
index 7899fb71..b0d5ce8d 100644
--- a/tests/fastcgi-responder.conf
+++ b/tests/fastcgi-responder.conf
@@ -26,7 +26,7 @@ $HTTP["host"] == "auth.example.org" {
     server.name = "auth.example.org"
 
     $HTTP["url"] =$ ".php" {
-	auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd"
+	auth.backend.htpasswd.userfile = env.SRCDIR + "/lighttpd.htpasswd"
 	auth.backend = "htpasswd"
 	auth.require = (
 		"" => (
diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf
index b4ab4bfa..d186dc82 100644
--- a/tests/lighttpd.conf
+++ b/tests/lighttpd.conf
@@ -194,7 +194,7 @@ $HTTP["host"] == "lowercase-exclude" {
 $HTTP["host"] == "lowercase-auth" {
 	server.force-lowercase-filenames = "enable"
 	auth.backend = "plain"
-	auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
+	auth.backend.plain.userfile = env.SRCDIR + "/lighttpd.user"
 	auth.require = (
 		"/image.jpg" => (
 			"method"  => "digest",
@@ -231,11 +231,11 @@ $HTTP["host"] == "deflate-cache.example.org" {
 $HTTP["host"] =~ "^auth-" {
 	$HTTP["host"] == "auth-htpasswd.example.org" {
 		auth.backend = "htpasswd"
-		auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd"
+		auth.backend.htpasswd.userfile = env.SRCDIR + "/lighttpd.htpasswd"
 	}
 	$HTTP["host"] == "auth-plain.example.org" {
 		auth.backend = "plain"
-		auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
+		auth.backend.plain.userfile = env.SRCDIR + "/lighttpd.user"
 	}
 	auth.require = (
 		"/server-status" => (
diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t
index 25016e60..c225bfb4 100755
--- a/tests/mod-fastcgi.t
+++ b/tests/mod-fastcgi.t
@@ -79,7 +79,7 @@ EOF
 	ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment');
 
 SKIP: {
-	skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd';
+	skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'};
 
 	$t->{REQUEST}  = ( <<EOF
 GET /get-server-env.php?env=REMOTE_USER HTTP/1.0
diff --git a/tests/prepare.sh b/tests/prepare.sh
index 557ae77d..49f5aff9 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -33,9 +33,6 @@ cp "${srcdir}/docroot/"*.html \
    "${srcdir}/docroot/"*.fcgi \
    "${srcdir}/docroot/"*.txt \
    "${tmpdir}/servers/www.example.org/pages/"
-cp "${srcdir}/lighttpd.user" "${tmpdir}/"
-cp "${srcdir}/lighttpd.htpasswd" "${tmpdir}/"
-cp "${srcdir}/var-include-sub.conf" "${tmpdir}/../"
 
 # create some content
 touch "${tmpdir}/servers/www.example.org/pages/image.jpg" \
diff --git a/tests/request.t b/tests/request.t
index f56a4300..6a2f0075 100755
--- a/tests/request.t
+++ b/tests/request.t
@@ -971,6 +971,7 @@ ok($tf->handle_http($t) == 0, 'lowercase access');
 my $docroot = $tf->{'TESTDIR'}."/tmp/lighttpd/servers/www.example.org/pages";
 
 sub init_testbed {
+    return 0 if $tf->{'win32native'}; # win32native lighttpd.exe
     return 0 unless eval { symlink("",""); 1 };
     my $f = "$docroot/index.html";
     my $l = "$docroot/index.xhtml";
@@ -1105,7 +1106,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
 ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain');
 
 SKIP: {
-	skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd';
+	skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'};
 $t->{REQUEST}  = ( <<EOF
 GET /server-config HTTP/1.0
 Host: auth-htpasswd.example.org