stas 2004/04/04 21:35:21
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
TestConfig.pm
perl-framework/Apache-Test Changes
Log:
Don't try to set ulimit unlimited for coredumps on Solaris, unless run
as root
Submitted by: Rob Kinyon <[EMAIL PROTECTED]>
Revision Changes Path
1.163 +11 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -u -r1.162 -r1.163
--- TestRun.pm 25 Mar 2004 01:31:28 -0000 1.162
+++ TestRun.pm 5 Apr 2004 04:35:21 -0000 1.163
@@ -616,6 +616,17 @@
sub set_ulimit_via_sh {
return if Apache::TestConfig::WINFU;
return if $ENV{APACHE_TEST_ULIMIT_SET};
+
+ # only root can allow unlimited core dumps on Solaris (8 && 9?)
+ if (Apache::TestConfig::SOLARIS) {
+ my $user = getpwuid($>) || '';
+ if ($user ne 'root') {
+ warning "Skipping 'set unlimited ulimit for coredumps', " .
+ "since we are running as a non-root user on Solaris";
+ return;
+ }
+ }
+
my $binsh = '/bin/sh';
return unless -e $binsh;
$ENV{APACHE_TEST_ULIMIT_SET} = 1;
1.218 +1 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -u -r1.217 -r1.218
--- TestConfig.pm 1 Apr 2004 23:57:17 -0000 1.217
+++ TestConfig.pm 5 Apr 2004 04:35:21 -0000 1.218
@@ -20,6 +20,7 @@
use constant WIN32 => $^O eq 'MSWin32';
use constant CYGWIN => $^O eq 'cygwin';
use constant NETWARE => $^O eq 'NetWare';
+use constant SOLARIS => $^O eq 'solaris';
use constant WINFU => WIN32 || CYGWIN || NETWARE;
use constant COLOR => ($ENV{APACHE_TEST_COLOR} && -t STDOUT) ? 1 : 0;
1.117 +3 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -u -r1.116 -r1.117
--- Changes 2 Apr 2004 00:07:53 -0000 1.116
+++ Changes 5 Apr 2004 04:35:21 -0000 1.117
@@ -8,6 +8,9 @@
=item 1.10-dev
+Don't try to set ulimit unlimited for coredumps on Solaris, unless run
+as root [Rob Kinyon <[EMAIL PROTECTED]>]
+
Added '-httpd_conf_extra <filename>' configuration option to
allow a file of server config directives to be inherited
in addition to the server's own httpd.conf file (or the one
