Change 34277 by [EMAIL PROTECTED] on 2008/09/05 16:34:16
Integrate:
[ 34247]
Integrate:
[ 34091]
Subject: [PATCH-revised^6] common test code for timed bail
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Sat, 28 Jun 2008 15:18:48 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34109]
Subject: [PATCH - revised^4] test.pl fix
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Mon, 7 Jul 2008 13:29:14 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34147]
Subject: [PATCH] test.pl
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 11 Jul 2008 11:07:07 -0400
Message-ID: <[EMAIL PROTECTED]>
Jerry found that localizing $? doesn't shield the effects of wait()
unless you actually assign something to $?
[ 34154]
Subject: [PATCH] watchdog() fix for MSWin32
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Wed, 23 Jul 2008 12:19:36 -0400
Message-ID: <[EMAIL PROTECTED]>
Adds a needed diag message to the watchdog() function for MSWin32.
[ 34250]
Integrate:
[ 34097]
Avoid using -> function call notation within test.pl, which is supposed
to keep to simple constructions to facilitate accurately testing the
core interpreter, which might be buggy.
[ 34152]
Subject: [PATCH] Fix skips in test.pl
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 18 Jul 2008 09:09:41 -0400
Message-ID: <[EMAIL PROTECTED]>
Changes skip messages to be consistent with Test::Builder.
[ 34173]
Better temporary file name generation. (Avoid using ++, avoid file
names clashing between different scripts, which may now be executing
in parallel)
[ 34178]
A proper tempfile function that can be used multiple times.
[ 34179]
Fix bug in counting in tempfile().
Also we need to note file names we give out, as some callers don't
create them before calling us a second time.
Add a regexp that matches the tempfile() names, for tests that want to
munge output.
Affected files ...
... //depot/maint-5.8/perl/pod/perltodo.pod#47 integrate
... //depot/maint-5.8/perl/t/test.pl#24 integrate
Differences ...
==== //depot/maint-5.8/perl/pod/perltodo.pod#47 (text) ====
Index: perl/pod/perltodo.pod
--- perl/pod/perltodo.pod#46~33932~ 2008-05-25 16:00:21.000000000 -0700
+++ perl/pod/perltodo.pod 2008-09-05 09:34:16.000000000 -0700
@@ -39,12 +39,6 @@
require careful checking to find all places that call them, and change those
correctly.
-=head2 common test code for timed bail out
-
-Write portable self destruct code for tests to stop them burning CPU in
-infinite loops. This needs to avoid using alarm, as some of the tests are
-testing alarm/sleep or timers.
-
=head2 POD -E<gt> HTML conversion in the core still sucks
Which is crazy given just how simple POD purports to be, and how simple HTML
==== //depot/maint-5.8/perl/t/test.pl#24 (text) ====
Index: perl/t/test.pl
--- perl/t/test.pl#23~33216~ 2008-02-02 14:23:57.000000000 -0800
+++ perl/t/test.pl 2008-09-05 09:34:16.000000000 -0700
@@ -20,6 +20,7 @@
my $test = 1;
my $planned;
my $noplan;
+my $Perl; # Safer version of $^X set by which_perl()
$TODO = 0;
$NO_ENDING = 0;
@@ -69,9 +70,7 @@
return unless @_;
my @mess = map { /^#/ ? "$_\n" : "# $_\n" }
map { split /\n/ } @_;
- my $func = $TODO ? \&_print : \&_print_stderr;
- $func->(@mess);
-
+ $TODO ? _print(@mess) : _print_stderr(@mess);
}
sub diag {
@@ -80,7 +79,7 @@
sub skip_all {
if (@_) {
- _print "1..0 # Skipped: @_\n";
+ _print "1..0 # Skip @_\n";
} else {
_print "1..0\n";
}
@@ -317,7 +316,7 @@
my $why = shift;
my $n = @_ ? shift : 1;
for (1..$n) {
- _print "ok $test # skip: $why\n";
+ _print "ok $test # skip $why\n";
$test = $test + 1;
}
local $^W = 0;
@@ -329,7 +328,7 @@
my $n = @_ ? shift : 1;
for (1..$n) {
- _print "not ok $test # TODO & SKIP: $why\n";
+ _print "not ok $test # TODO & SKIP $why\n";
$test = $test + 1;
}
local $^W = 0;
@@ -423,7 +422,10 @@
sub _create_runperl { # Create the string to qx in runperl().
my %args = @_;
- my $runperl = $^X =~ m/\s/ ? qq{"$^X"} : $^X;
+ my $runperl = which_perl();
+ if ($runperl =~ m/\s/) {
+ $runperl = qq{"$runperl"};
+ }
#- this allows, for example, to set PERL_RUNPERL_DEBUG=/usr/bin/valgrind
if ($ENV{PERL_RUNPERL_DEBUG}) {
$runperl = "$ENV{PERL_RUNPERL_DEBUG} $runperl";
@@ -476,14 +478,14 @@
$args{stdin} =~ s/\r/\\r/g;
if ($is_mswin || $is_netware || $is_vms) {
- $runperl = qq{$^X -e "print qq(} .
+ $runperl = qq{$Perl -e "print qq(} .
$args{stdin} . q{)" | } . $runperl;
}
elsif ($is_macos) {
# MacOS can only do two processes under MPW at once;
# the test itself is one; we can't do two more, so
# write to temp file
- my $stdin = qq{$^X -e 'print qq(} . $args{stdin} . qq{)' >
teststdin; };
+ my $stdin = qq{$Perl -e 'print qq(} . $args{stdin} . qq{)' >
teststdin; };
if ($args{verbose}) {
my $stdindisplay = $stdin;
$stdindisplay =~ s/\n/\n\#/g;
@@ -493,7 +495,7 @@
$runperl .= q{ < teststdin };
}
else {
- $runperl = qq{$^X -e 'print qq(} .
+ $runperl = qq{$Perl -e 'print qq(} .
$args{stdin} . q{)' | } . $runperl;
}
}
@@ -563,7 +565,6 @@
}
# A somewhat safer version of the sometimes wrong $^X.
-my $Perl;
sub which_perl {
unless (defined $Perl) {
$Perl = $^X;
@@ -618,10 +619,37 @@
}
}
+my %tmpfiles;
+END { unlink_all keys %tmpfiles }
-my $tmpfile = "misctmp000";
-1 while -f ++$tmpfile;
-END { unlink_all $tmpfile }
+# A regexp that matches the tempfile names
+$::tempfile_regexp = 'tmp\d+[A-Z][A-Z]?';
+
+# Avoid ++, avoid ranges, avoid split //
+my @letters = qw(A B C D E F G H I J K L M N O P Q R S T U V W X Y Z);
+sub tempfile {
+ my $count = 0;
+ do {
+ my $temp = $count;
+ my $try = "tmp$$";
+ do {
+ $try .= $letters[$temp % 26];
+ $temp = int ($temp / 26);
+ } while $temp;
+ # Need to note all the file names we allocated, as a second request may
+ # come before the first is created.
+ if (!-e $try && !$tmpfiles{$try}) {
+ # We have a winner
+ $tmpfiles{$try}++;
+ return $try;
+ }
+ $count = $count + 1;
+ } while $count < 26 * 26;
+ die "Can't find temporary file name starting 'tmp$$'";
+}
+
+# This is the temporary file for _fresh_perl
+my $tmpfile = tempfile();
#
# _fresh_perl
@@ -657,8 +685,8 @@
# Clean up the results into something a bit more predictable.
$results =~ s/\n+$//;
- $results =~ s/at\s+misctmp\d+\s+line/at - line/g;
- $results =~ s/of\s+misctmp\d+\s+aborted/of - aborted/g;
+ $results =~ s/at\s+$::tempfile_regexp\s+line/at - line/g;
+ $results =~ s/of\s+$::tempfile_regexp\s+aborted/of - aborted/g;
# bison says 'parse error' instead of 'syntax error',
# various yaccs may or may not capitalize 'syntax'.
@@ -781,4 +809,129 @@
_ok( !$diag, _where(), $name );
}
+# Set a watchdog to timeout the entire test file
+# NOTE: If the test file uses 'threads', then call the watchdog() function
+# _AFTER_ the 'threads' module is loaded.
+sub watchdog ($)
+{
+ my $timeout = shift;
+ my $timeout_msg = 'Test process timed out - terminating';
+
+ my $pid_to_kill = $$; # PID for this process
+
+ # Don't use a watchdog process if 'threads' is loaded -
+ # use a watchdog thread instead
+ if (! $threads::threads) {
+
+ # On Windows and VMS, try launching a watchdog process
+ # using system(1, ...) (see perlport.pod)
+ if (($^O eq 'MSWin32') || ($^O eq 'VMS')) {
+ # On Windows, try to get the 'real' PID
+ if ($^O eq 'MSWin32') {
+ eval { require Win32; };
+ if (defined(&Win32::GetCurrentProcessId)) {
+ $pid_to_kill = Win32::GetCurrentProcessId();
+ }
+ }
+
+ # If we still have a fake PID, we can't use this method at all
+ return if ($pid_to_kill <= 0);
+
+ # Launch watchdog process
+ my $watchdog;
+ eval {
+ local $SIG{'__WARN__'} = sub {
+ _diag("Watchdog warning: $_[0]");
+ };
+ $watchdog = system(1, which_perl(), '-e',
+ "sleep($timeout);" .
+ "warn('#
$timeout_msg\n');" .
+ "kill('KILL',
$pid_to_kill);");
+ };
+ if ($@ || ($watchdog <= 0)) {
+ _diag('Failed to start watchdog');
+ _diag($@) if $@;
+ undef($watchdog);
+ return;
+ }
+
+ # Add END block to parent to terminate and
+ # clean up watchdog process
+ eval "END { local \$! = 0; local \$? = 0;
+ wait() if kill('KILL', $watchdog); };";
+ return;
+ }
+
+ # Try using fork() to generate a watchdog process
+ my $watchdog;
+ eval { $watchdog = fork() };
+ if (defined($watchdog)) {
+ if ($watchdog) { # Parent process
+ # Add END block to parent to terminate and
+ # clean up watchdog process
+ eval "END { local \$! = 0; local \$? = 0;
+ wait() if kill('KILL', $watchdog); };";
+ return;
+ }
+
+ ### Watchdog process code
+
+ # Load POSIX if available
+ eval { require POSIX; };
+
+ # Execute the timeout
+ sleep($timeout - 2) if ($timeout > 2); # Workaround for perlbug
#49073
+ sleep(2);
+
+ # Kill test process if still running
+ if (kill(0, $pid_to_kill)) {
+ _diag($timeout_msg);
+ kill('KILL', $pid_to_kill);
+ }
+
+ # Don't execute END block (added at beginning of this file)
+ $NO_ENDING = 1;
+
+ # Terminate ourself (i.e., the watchdog)
+ POSIX::_exit(1) if (defined(&POSIX::_exit));
+ exit(1);
+ }
+
+ # fork() failed - fall through and try using a thread
+ }
+
+ # Use a watchdog thread because either 'threads' is loaded,
+ # or fork() failed
+ if (eval { require threads; }) {
+ threads->create(sub {
+ # Load POSIX if available
+ eval { require POSIX; };
+
+ # Execute the timeout
+ sleep($timeout);
+
+ # Kill the parent (and ourself)
+ select(STDERR); $| = 1;
+ _diag($timeout_msg);
+ POSIX::_exit(1) if (defined(&POSIX::_exit));
+ kill('KILL', $pid_to_kill);
+ })->detach();
+ return;
+ }
+
+ # If everything above fails, then just use an alarm timeout
+ if (eval { alarm($timeout); 1; }) {
+ # Load POSIX if available
+ eval { require POSIX; };
+
+ # Alarm handler will do the actual 'killing'
+ $SIG{'ALRM'} = sub {
+ select(STDERR); $| = 1;
+ _diag($timeout_msg);
+ POSIX::_exit(1) if (defined(&POSIX::_exit));
+ kill('KILL', $pid_to_kill);
+ };
+ }
+}
+
1;
End of Patch.
