add .perl files to the t94kwalitee struct tests and fix the non strict

.perl code

diff --git a/doco.perl b/doco.perl
index dd195975ab4bef7aa7b8926c78ceeab6c7d38db3..8e608defafb531a65cb7ab209d48945d682ed8a3 100755 (executable)
--- a/doco.perl
+++ b/doco.perl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
 #!/usr/bin/perl -w

+use strict;

 
 use Cwd;
 
 
 use Cwd;
 


@@ -13,14 +14,17 @@ use Cwd;
 
 my $comm = shift or USAGE();
 
 
 my $comm = shift or USAGE();
 

+my @files;

 if ($comm eq "-f") {
 if ($comm eq "-f") {

-       if (!@ARGV) {
-               getfiles();
-               @files = @CFILES;
+       if (@ARGV) {
+               @files = @ARGV;
+       }
+       else {
+               @files = getfiles();

        }
 
        for my $file (@files) {
        }
 
        for my $file (@files) {

-               local(*FH, $/); open(FH,"$BASE/$file") or die $!;
+               local(*FH, $/); open(FH,"< $file") or die $!;

                my $data = <FH>; close(FH);
                while( $data =~ m/FIXME:(.*?)\*\//sg ) {
                        printf("%10.10s:%5d %s\n", $file, ptol($data, pos($data)), $1);
                my $data = <FH>; close(FH);
                while( $data =~ m/FIXME:(.*?)\*\//sg ) {
                        printf("%10.10s:%5d %s\n", $file, ptol($data, pos($data)), $1);


@@ -33,7 +37,7 @@ if ($comm eq "-d") {
        USAGE() if !@ARGV;
        my $file = shift; 
        getfiles();
        USAGE() if !@ARGV;
        my $file = shift; 
        getfiles();

-       local(*FH, $/); open(FH, "$BASE/$file") or die $!;
+       local(*FH, $/); open(FH, "< $file") or die $!;

        my $data = <FH>; close(FH);
        $data =~ s/^(=item)/\n$1/mg;
        $data =~ s/^(=cut)/\n~~~~~~~~\n\n$1\n\n/mg;
        my $data = <FH>; close(FH);
        $data =~ s/^(=item)/\n$1/mg;
        $data =~ s/^(=cut)/\n~~~~~~~~\n\n$1\n\n/mg;


@@ -58,12 +62,12 @@ EOF
 }
 
 sub getfiles {
 }
 
 sub getfiles {

-       $BASE=cwd;
+       my $BASE=cwd;

        local(*FH);
        open(FH,"$BASE/MANIFEST") or die "Cannot open MANIFEST file: $!\n";
        my @MANIFEST = <FH>;
        chomp(@MANIFEST);
        local(*FH);
        open(FH,"$BASE/MANIFEST") or die "Cannot open MANIFEST file: $!\n";
        my @MANIFEST = <FH>;
        chomp(@MANIFEST);

-       @CFILES = grep { m/\.c\s*$/ } @MANIFEST;
+       return grep { m/\.(c|im)\s*$/ } @MANIFEST;

 }
 
 # string position to line number in string
 }
 
 # string position to line number in string

diff --git a/errep.perl b/errep.perl
index b4ae4cbb03af815e70c2f12729eb9e6b8edc0695..6b4b5fde8028b0404dc33071a37efb63effc0334 100644 (file)
--- a/errep.perl
+++ b/errep.perl
@@ -1,10 +1,11 @@
-
+#!perl -w
+use strict;

 
 use Config;
 
 
 use Config;
 

-@precommands=('uname -a','perl -V');
-@manpages=('dlopen','shl_load','dlsym','dlclose');
-@postcommands=map { "man $_ | col -bf | cat -s" } @manpages;
+my @precommands=('uname -a','perl -V');
+my @manpages=('dlopen','shl_load','dlsym','dlclose');
+my @postcommands=map { "man $_ | col -bf | cat -s" } @manpages;

 
 print <<EOF;
 
 
 print <<EOF;
 


@@ -27,7 +28,7 @@ print <<EOF;
 
 EOF
 
 
 EOF
 

-$a=<STDIN>;
+my $a=<STDIN>;

 chomp($a);
 die "Aborted!\n" if $a =~ /^n/i;
 
 chomp($a);
 die "Aborted!\n" if $a =~ /^n/i;
 


@@ -39,7 +40,8 @@ open STDERR, '>&STDOUT' or die $!;
 
 rcomm('rm testout/*');
 rcomm(@precommands);
 
 rcomm('rm testout/*');
 rcomm(@precommands);

-rcomm("$^X Makefile.PL") || rcomm("make") || rcomm("make test");
+my $make = $Config{make};
+rcomm("$^X Makefile.PL") || rcomm("$make") || rcomm("$make test TEST_VERBOSE=1");

 head("Logfiles from run");
 dumplogs();
 
 head("Logfiles from run");
 dumplogs();
 

diff --git a/filterlist.perl b/filterlist.perl
index 69ee19984ed031e438a5004b50837f8230ae865a..d73fefeb8a0908a23bb9bc406b2b3aff83500328 100755 (executable)
--- a/filterlist.perl
+++ b/filterlist.perl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl 
 #!/usr/bin/perl 

-
+use strict;

 use Imager;
 print "Filter          Arguments\n";
 use Imager;
 print "Filter          Arguments\n";

-for $filt (keys %Imager::filters) {
-    @callseq=@{$Imager::filters{$filt}{'callseq'}};
-    %defaults=%{$Imager::filters{$filt}{'defaults'}};
+for my $filt (keys %Imager::filters) {
+    my @callseq=@{$Imager::filters{$filt}{'callseq'} || {}};
+    my %defaults=%{$Imager::filters{$filt}{'defaults'} || {}};

     shift(@callseq);
     shift(@callseq);

-    @b=map { exists($defaults{$_}) ? $_.'('.$defaults{$_}.')' : $_ } @callseq;
-    $str=join(" ",@b);    
+    my @b=map { exists($defaults{$_}) ? $_.'('.$defaults{$_}.')' : $_ } @callseq;
+    my $str=join(" ",@b);    

     printf("%-15s %s\n",$filt,$str );
 }
     printf("%-15s %s\n",$filt,$str );
 }

diff --git a/t/t94kwalitee.t b/t/t94kwalitee.t
index f77c635f740f622e15c993a3454e976e5641e362..a39a96974d6dbfa5202b4766a8222f41f0977b35 100644 (file)
--- a/t/t94kwalitee.t
+++ b/t/t94kwalitee.t
@@ -9,7 +9,7 @@ my $manifest = maniread;
 
 # work up counts first
 
 
 # work up counts first
 

-my @pl_files = grep /\.(p[lm]|PL)$/, keys %$manifest;
+my @pl_files = grep /\.(p[lm]|PL|perl)$/, keys %$manifest;

 
 plan tests => scalar(@pl_files);
 
 
 plan tests => scalar(@pl_files);