[libcgi-test-perl] 11/24: Bailing out in Makefile.PL on Windows

Axel Beckert abe at deuxchevaux.org
Mon Jan 11 00:38:07 UTC 2016


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to annotated tag 0.50
in repository libcgi-test-perl.

commit 6d80513f62ece056935fa34e432f7ceaebe9bb98
Author: Alex Tokarev <nohuhu at nohuhu.org>
Date:   Fri May 16 20:05:47 2014 -0700

    Bailing out in Makefile.PL on Windows
    
    Tried to see why CGI::Test was failing in Windows; both Strawberry Perl
    and ActiveState Perl 5.18 are dying with SIGSEGV on fork/exec. This is
    not worth trying to fix.
---
 Changes                   | 7 +++++++
 Makefile.PL               | 2 ++
 lib/CGI/Test.pm           | 6 +++---
 lib/CGI/Test/Page.pm      | 6 ++++++
 lib/CGI/Test/Page/Real.pm | 6 ------
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Changes b/Changes
index f94102d..5c781c4 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,10 @@
+Fri May 16 20:03:11 PSD 2014    Alex Tokarev <tokarev at cpan.org>
+
+        Version 0.32
+
+        Makefile.PL will now bail out in Windows with CPAN Testers
+        friendly message to avoid bogus FAIL reports.
+
 Fri Apr 11 21:58:37 PSD 2014    Alex Tokarev <tokarev at cpan.org>
 
         Version 0.31
diff --git a/Makefile.PL b/Makefile.PL
index fb64296..e7c861b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,6 +10,8 @@
 #
 use ExtUtils::MakeMaker;
 
+die "OS unsupported" if $^O =~ /Win32/;
+
 # Munge test CGI scripts so that they run under current Perl
 my @cgi_files = do {
     my $cgi_dir = 't/cgi';
diff --git a/lib/CGI/Test.pm b/lib/CGI/Test.pm
index 2a856c7..73cf6c7 100644
--- a/lib/CGI/Test.pm
+++ b/lib/CGI/Test.pm
@@ -24,7 +24,7 @@ use Cwd qw(abs_path);
 require Exporter;
 use vars qw($VERSION @ISA @EXPORT);
 
-$VERSION = '0.31';
+$VERSION = '0.32';
 @ISA     = qw(Exporter);
 @EXPORT  = qw(ok);
 
@@ -49,8 +49,8 @@ sub new
 
     my $ubase = $params{-base_url};
     my $dir   = $params{-cgi_dir};
-    my $doc   = $params{-doc_dir} || "/var/www";
-    my $tmp   = $params{-tmp_dir} || $ENV{TMPDIR} || "/tmp";
+    my $doc   = $params{-doc_dir} || ".";
+    my $tmp   = $params{-tmp_dir} || $ENV{TMPDIR} || $ENV{TEMP} || "/tmp";
     my $env   = $params{-cgi_env};
 
     my $uri = URI->new($ubase);
diff --git a/lib/CGI/Test/Page.pm b/lib/CGI/Test/Page.pm
index 5b25b8e..cdfd267 100644
--- a/lib/CGI/Test/Page.pm
+++ b/lib/CGI/Test/Page.pm
@@ -40,6 +40,12 @@ sub raw_content {
     return $self->{raw_content};
 }
 
+sub raw_content_ref {
+    my ($self) = @_;
+
+    return \$self->{raw_content};
+}
+
 ######################################################################
 sub content_type
 {
diff --git a/lib/CGI/Test/Page/Real.pm b/lib/CGI/Test/Page/Real.pm
index 05a9613..7ed3ae3 100644
--- a/lib/CGI/Test/Page/Real.pm
+++ b/lib/CGI/Test/Page/Real.pm
@@ -40,12 +40,6 @@ sub uri
     return $this->{uri};
 }
 
-sub raw_content_ref
-{
-    my $this = shift;
-    return \$this->{raw_content};
-}
-
 #
 # ->_init
 #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcgi-test-perl.git



More information about the Pkg-perl-cvs-commits mailing list