Skip to content

feature: support windows OS testing. #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feature: support windows OS testing. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/Test/Nginx/Socket.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,10 @@ sub read_event_handler ($) {
my $bytes = sysread( $ctx->{sock}, $read_buf, $ctx->{buf_size} );

if ( !defined $bytes ) {
if ( $! == EAGAIN ) {
# on Windows OS, always get POSIX::WSAEWOULDBLOCK rather then EAGAIN
$^E = POSIX::WSAEWOULDBLOCK;

if (( $! == EAGAIN ) || ( $! == POSIX::WSAEWOULDBLOCK ) || ( $! eq $^E )) {

#warn "read again...";
#sleep 0.002;
Expand Down
76 changes: 59 additions & 17 deletions lib/Test/Nginx/Util.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use IO::Socket::INET;
use IO::Socket::UNIX;
use Test::LongString;
use Carp qw( croak );
use String::Escape qw( printable );

our $ConfigVersion;
our $FilterHttpConfig;
Expand Down Expand Up @@ -182,7 +183,14 @@ if ($UseValgrind) {

sub is_running ($) {
my $pid = shift;
return kill 0, $pid;
my $running = kill(0, $pid);

if (($^O eq 'MSWin32') && ($running)) {
# on Windows OS, we use 'wmic' to check the process status
my $reply = `wmic PROCESS where "ProcessId=$pid" 2>NUL | find /I "nginx.exe" 2>NUL`;
return $reply;
}
return $running;
}

sub gen_rand_str {
Expand Down Expand Up @@ -299,9 +307,16 @@ sub use_hup() {
$UseHup = 1;
}

sub encode_c_string($) {
my $input = shift;
return printable($input)
}

our @CleanupHandlers;
our @BlockPreprocessors;

sub bail_out (@);

our $Randomize = $ENV{TEST_NGINX_RANDOMIZE};
our $NginxBinary = $ENV{TEST_NGINX_BINARY} || 'nginx';
our $Workers = 1;
Expand Down Expand Up @@ -629,8 +644,16 @@ sub kill_process ($$$) {
warn "WARNING: killing the child process $pid.\n";
}

if (kill(SIGTERM, $pid) == 0) { # send term signal
warn "WARNING: failed to send term signal to the child process with PID $pid.\n";
if ($^O eq 'MSWin32') {
# On windows OS, we use 'nginx.exe -s stop' to stop.
# NOTE: use 'nginx.exe -s quit' might let process get hang.
if (0 != system("$NginxBinary -s stop -p $ServRoot/ 2>nul")) {
warn "WARNING: failed to send term signal to the child process with PID $pid.\n";
}
} else {
if (kill(SIGTERM, $pid) == 0) { # send term signal
warn "WARNING: failed to send term signal to the child process with PID $pid.\n";
}
}

$step *= 1.2;
Expand All @@ -644,9 +667,11 @@ sub kill_process ($$$) {
#system("ps aux|grep $pid > /dev/stderr");
warn "$name - WARNING: killing the child process $pid with force...";

if (getpgrp($pid) == $pid) {
if ($^O eq 'MSWin32') {
# On windows OS, we use 'TASKKILL' to kill process.
system("TASKKILL /F /PID $pid /T 2>nul");
} elsif (getpgrp($pid) == $pid) {
kill(SIGKILL, -$pid);

} else {
kill(SIGKILL, $pid);
}
Expand Down Expand Up @@ -988,12 +1013,18 @@ sub write_config_file ($$$) {

open my $out, ">$ConfFile" or
bail_out "Can't open $ConfFile for writing: $!\n";

# encodes the file path text. avoid the text like '\t' be treat as tab symbol on Windows OS
my $c_literal_err_log_file = encode_c_string($err_log_file);
my $c_literal_PidFile = encode_c_string($PidFile);
my $c_literal_AccLogFile = encode_c_string($AccLogFile);
my $c_literal_HtmlDir = encode_c_string($HtmlDir);
print $out <<_EOC_;
worker_processes $Workers;
daemon $DaemonEnabled;
master_process $MasterProcessEnabled;
error_log $err_log_file $LogLevel;
pid $PidFile;
error_log $c_literal_err_log_file $LogLevel;
pid $c_literal_PidFile;
env MOCKEAGAIN_VERBOSE;
env MOCKEAGAIN;
env MOCKEAGAIN_WRITE_TIMEOUT_PATTERN;
Expand Down Expand Up @@ -1025,7 +1056,6 @@ _EOC_
$ServerConfigHttp3 .= " ssl_certificate_key $Http3SSLCrtKey;\n";
}
}

} elsif (use_http2($block)) {
$listen_opts .= " http2";
}
Expand All @@ -1041,7 +1071,7 @@ _EOC_
$main_config

http {
access_log $AccLogFile;
access_log $c_literal_AccLogFile;
#access_log off;

default_type text/plain;
Expand Down Expand Up @@ -1085,7 +1115,7 @@ _EOC_
if (! $NoRootLocation) {
print $out <<_EOC_;
location / {
root $HtmlDir;
root $c_literal_HtmlDir;
index index.html index.htm;
}
_EOC_
Expand Down Expand Up @@ -1135,11 +1165,14 @@ env MOCKNOEAGAIN_VERBOSE;
env MOCKNOEAGAIN;
_EOC_

if (defined $WorkerUser) {
print $out "user $WorkerUser;\n";

} elsif ($> == 0) { # being root
print $out "user root;\n";
# we won't append the nginx user directive on Windows OS.
if ($^O ne 'MSWin32') {
if (defined $WorkerUser) {
print $out "user $WorkerUser;\n";
} elsif ($> == 0) { # being root
print $out "user root;\n";
}
}

close $out;
Expand Down Expand Up @@ -1837,10 +1870,19 @@ start_nginx:

my $cmd;

if ($NginxVersion >= 0.007053) {
$cmd = "$NginxBinary -p $ServRoot/ -c $ConfFile > /dev/null";
if ($^O eq 'MSWin32') {
# on Windows OS, use 'start /B nginx.exe ...' to start server in background mode.
if ($NginxVersion >= 0.007053) {
$cmd = "start /B $NginxBinary -p $ServRoot/ -c $ConfFile >nul";
} else {
$cmd = "start /B $NginxBinary -c $ConfFile >nul";
}
} else {
$cmd = "$NginxBinary -c $ConfFile > /dev/null";
if ($NginxVersion >= 0.007053) {
$cmd = "$NginxBinary -p $ServRoot/ -c $ConfFile > /dev/null";
} else {
$cmd = "$NginxBinary -c $ConfFile > /dev/null";
}
}

if ($UseRr) {
Expand Down