diff options
| author | mkanat%bugzilla.org <> | 2009-09-04 23:08:05 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2009-09-04 23:08:05 +0200 |
| commit | ccaf82a249d988a9192034b5afa33b754aefd379 (patch) | |
| tree | dba9420d26b014b5afe4e59f3a6010ca93b11152 /testserver.pl | |
| parent | 120fc1b9be07ee44c98a9ec2c5c64568e9ebccbd (diff) | |
| download | bugzilla-ccaf82a249d988a9192034b5afa33b754aefd379.tar.gz bugzilla-ccaf82a249d988a9192034b5afa33b754aefd379.tar.xz | |
Bug 224588: Unify ($^O =~ /MSWin/) checks (always use ON_WINDOWS)
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'testserver.pl')
| -rwxr-xr-x | testserver.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testserver.pl b/testserver.pl index 1e2af661a..3142685bc 100755 --- a/testserver.pl +++ b/testserver.pl @@ -42,7 +42,7 @@ if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/)) # Try to determine the GID used by the web server. my @pscmds = ('ps -eo comm,gid', 'ps -acxo command,gid', 'ps -acxo command,rgid'); my $sgid = 0; -if ($^O !~ /MSWin32/i) { +if (!ON_WINDOWS) { foreach my $pscmd (@pscmds) { open PH, "$pscmd 2>/dev/null |"; while (my $line = <PH>) { @@ -83,7 +83,7 @@ Please refer to the web server configuration section of the Bugzilla guide. If you are using virtual hosts or suexec, this warning may not apply.\n"; } } -elsif ($^O !~ /MSWin32/i) { +elsif (!ON_WINDOWS) { print "TEST-WARNING Failed to find the GID for the 'httpd' process, unable to validate webservergroup.\n"; @@ -138,7 +138,7 @@ if ($@ eq '') { # Ensure major versions of GD and libgd match # Windows's GD module include libgd.dll, guaranteed to match - if ($^O !~ /MSWin32/i) { + if (!ON_WINDOWS) { my $gdlib = `gdlib-config --version 2>&1` || ""; $gdlib =~ s/\n$//; if (!$gdlib) { |