From 9cd28a89456f57a491c83600b95f6dd0840e7ec1 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Tue, 3 Jun 2008 03:35:27 +0000 Subject: [PATCH] fix missinginclude tests Try to open the missing file in the same way PLP::source() will, to obtain the same warning message. For example MSWin32-x86-multi-thread said: Can't open "C:\Perl\cpan\build\PLP-3.22-ZfVju5\missinginclude" (No such file or directory) while several CPANTS linuxes were localized: Can't open "/tmp/missinginclude" (Datei oder Verzeichnis nicht gefunden) --- META.yml | 4 ++-- lib/PLP.pm | 2 +- t/50-cgi.t | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/META.yml b/META.yml index 84a832a..8b8595a 100644 --- a/META.yml +++ b/META.yml @@ -1,7 +1,7 @@ --- #YAML:1.0 name: PLP abstract: Perl in HTML pages -version: 3.22 +version: 3.22_01 version_from: PLP.pm author: - Mischa POSLAWSKY @@ -32,7 +32,7 @@ optional_features: provides: PLP: file: lib/PLP.pm - version: 3.22 + version: 3.22_01 PLP::Script: file: lib/PLP.pm PLP::Functions: diff --git a/lib/PLP.pm b/lib/PLP.pm index 54a3b91..d17c9c6 100644 --- a/lib/PLP.pm +++ b/lib/PLP.pm @@ -14,7 +14,7 @@ use File::Spec; use strict; use warnings; -our $VERSION = '3.22'; +our $VERSION = '3.22_01'; # Subs in this package: # _default_error($plain, $html) Default error handler diff --git a/t/50-cgi.t b/t/50-cgi.t index cd10ee4..0de6940 100644 --- a/t/50-cgi.t +++ b/t/50-cgi.t @@ -106,6 +106,15 @@ $HEAD TEST +SKIP: { + +my $INCFILE = File::Spec->rel2abs("$base/missinginclude"); +if (open my $dummy, "<", $INCFILE) { # like PLP::source will + fail("file missinginclude shouldn't exist"); + skip("missinginclude tests", 2); +} +my $INCWARN = qq{Can't open "$INCFILE" ($!)}; + plp_is('warnings', split /\n\n/, < @@ -129,16 +138,16 @@ Useless use of a constant in void context at $testfile line 4. warning at $testfile line 6. 4 -
Debug information:
Can't open "$base/missinginclude" (No such file or directory) at $testfile line 8. +
Debug information:
$INCWARN at $testfile line 8.
5 -
Debug information:
Can't open "$base/missinginclude" (No such file or directory) at $testfile line 10. +
Debug information:
$INCWARN at $testfile line 10.
TEST plp_is('$PLP::ERROR', '<: $PLP::ERROR = sub {print "Oh no: $_[0]"} :> <(missinginclude)>.', - qq{$HEAD\n Oh no: Can't open "$base/missinginclude" (No such file or directory) at $testfile line 1.\n\n} + qq{$HEAD\n Oh no: $INCWARN at $testfile line 1.\n\n} ); #TODO: 404 @@ -149,6 +158,8 @@ plp_is('$PLP::DEBUG', "Content-Type: text/plain\n\nContent-Type: text/html\n\n1" ); +} + plp_is('utf8', '<: use open qw/:std :utf8/; print chr 191', <