[svn:parrot] r44477 - in branches/rm_cflags: config/auto t/steps/auto

darbelo at svn.parrot.org darbelo at svn.parrot.org
Thu Feb 25 20:27:41 UTC 2010


Author: darbelo
Date: Thu Feb 25 20:27:40 2010
New Revision: 44477
URL: https://trac.parrot.org/parrot/changeset/44477

Log:
Make codetest happy.

Modified:
   branches/rm_cflags/config/auto/warnings.pm
   branches/rm_cflags/t/steps/auto/warnings-01.t

Modified: branches/rm_cflags/config/auto/warnings.pm
==============================================================================
--- branches/rm_cflags/config/auto/warnings.pm	Thu Feb 25 20:24:05 2010	(r44476)
+++ branches/rm_cflags/config/auto/warnings.pm	Thu Feb 25 20:27:40 2010	(r44477)
@@ -57,22 +57,22 @@
         - cow.c
         - pig.c
   g++:
-    ... 
+    ...
 
 'basic' warnings are always used.
 
-'cage' warnings are added only if --cage is specified during Configure. This
-can be used to hold warnings that aren't ready to be added to the default run
-yet.
+'cage' warnings are added only if --cage is specified during
+Configure. This can be used to hold warnings that aren't ready to be
+added to the default run yet.
 
-'only' should be used as we add new warnings to the build, it will 
-let us insure that files we know are clean for a new warning stay clean.
+'only' should be used as we add new warnings to the build, it will let
+us insure that files we know are clean for a new warning stay clean.
 
-'never' should be used when a particular file contains generated
-code (e.g. imcc) and we cannot update it to conform to the standards.
+'never' should be used when a particular file contains generated code
+(e.g. imcc) and we cannot update it to conform to the standards.
 
 'todo' functions just like never does, but it indicates that these
-files are expected to eventually be free of this warning. 
+files are expected to eventually be free of this warning.
 
 It is tempting to put this into a config file, but having it in
 perl gives us the ability to dynamically setup certain warnings based
@@ -92,7 +92,7 @@
         validated   => [],
     };
 
-    # begin gcc/g++ 
+    # begin gcc/g++
     my $gcc = {};
     my $gpp = {};
 
@@ -240,10 +240,9 @@
     if (exists $self->{'warnings'}{$compiler}{'only'}) {
         my %only = %{$self->{'warnings'}{$compiler}{'only'}};
         foreach my $warning (keys %only) {
-            next unless $self->valid_warning($conf, $warning); 
+            next unless $self->valid_warning($conf, $warning);
             foreach my $file (@{$only{$warning}}) {
                 $per_file{$file} = [ @warnings ] unless exists $per_file{$file};
-      
                 push @{$per_file{$file}}, $warning;
             }
         }
@@ -255,7 +254,6 @@
             foreach my $warning (keys %dont) {
                 foreach my $file (@{$dont{$warning}}) {
                     $per_file{$file} = [ @warnings ] unless exists $per_file{$file};
-          
                     @{$per_file{$file}} = grep {$warning ne $_} @{$per_file{$file}};
                 }
             }
@@ -265,7 +263,7 @@
     $conf->data->set('ccwarn', join(' ', @warnings));
     foreach my $file (keys %per_file) {
         $conf->data->set("ccwarn::$file", join(' ', @{$per_file{$file}}));
-    } 
+    }
 
     $self->set_result('done');
     return 1;
@@ -312,7 +310,7 @@
     );
 
     # Cleanup any remnants of the test compilation
-    $conf->cc_clean(); 
+    $conf->cc_clean();
 
     if ($exit_code) {
         unlink $output_file or die "Unable to unlink $output_file: $!";

Modified: branches/rm_cflags/t/steps/auto/warnings-01.t
==============================================================================
--- branches/rm_cflags/t/steps/auto/warnings-01.t	Thu Feb 25 20:24:05 2010	(r44476)
+++ branches/rm_cflags/t/steps/auto/warnings-01.t	Thu Feb 25 20:27:40 2010	(r44477)
@@ -109,8 +109,7 @@
 $conf->data->set( ccwarn => undef );
 ok( ! auto::warnings::_set_ccwarn($conf, $output, $warnings, $verbose),
     "_set_ccwarn returned false as expected" );
-ok( ! defined $conf->data->get( 'ccwarn' ), 
-    "Warnings set as expected" );
+ok( ! defined $conf->data->get( 'ccwarn' ), "Warnings set as expected" );
 
 } # End SKIP block for Sun/Solaris
 


More information about the parrot-commits mailing list