open STDOUT, '>', \my $output; # STDOUT buffered to scalar
select STDOUT; # output before start() (which selects PLPOUT)
eval {
- local $SIG{__WARN__} = sub { print $_[0] }; # enables warnings
+ local $SIG{__WARN__} = sub {
+ # include warnings in stdout (but modified to distinguish)
+ my $msg = shift;
+ my $eol = $msg =~ s/(\s*\z)// && $1;
+ print "<warning>$msg</warning>$eol"
+ };
PLP::everything();
};
+ my $failure = $@;
select ORGOUT; # return to original STDOUT
- not $@ or fail($test), diag(" Error: $@"), return;
+ if ($failure) {
+ fail($test);
+ diag(" Error: $failure");
+ return;
+ }
$output =~ s{((?:.+\n)*)}{ join "", sort split /(?<=\n)/, $1 }e; # order headers
is($output, $expect, $test);
}
local $SIG{__WARN__} = sub { die @_ };
# warnings module runs at BEGIN, so we need to use icky expression evals
eval qq(# line $line "$file"\n$code; return);
- return $@;
+ my $res = $@;
+ chomp $res;
+ return $res;
};
%ENV = (
my $SYNTAXERR = getwarning("q\cq\n\cq; syntax(error", 1, $testfile);
plp_is('fatal error', "runtime\n<: syntax(error :>\nruntime", <<TEST);
$HEAD
-<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR</td></tr></table>
+<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$SYNTAXERR
+</td></tr></table>
TEST
SKIP: {
6
$HEAD
-${VOIDWARN}1
+<warning>${VOIDWARN}</warning>
+1
2
-3warning at $testfile line 3.
+3<warning>warning at $testfile line 3.</warning>
4<table border=1 class="PLPerror"><tr><td><b>Debug information:</b><br>$INCWARN at $testfile line 4.
</td></tr></table>
SKIP: {
chmod 0244, $testfile or skip("changed permissions", 1);
plp_is('permission denied', undef, <<TEST);
+<warning>PLP: Can't read: $base/$testfile (/$testfile/test/123)</warning>
Content-Type: text/html
-PLP: Can't read: $base/$testfile (/$testfile/test/123)
Status: 403
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
$ENV{PATH_TRANSLATED} = "$base/missinginclude/test/123";
plp_is('not found', undef, <<TEST);
+<warning>PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)</warning>
Content-Type: text/html
-PLP: Not found: $base/missinginclude/test/123 (/$testfile/test/123)
Status: 404
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">