[svn:parrot] r36248 - in trunk: lib/Parrot t/configure

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sun Feb  1 15:06:59 2009
New Revision: 36248
URL: https://trac.parrot.org/parrot/changeset/36248

Log:
[configure] Reverting some perlcritic-induced revisions to Parrot::Configure
from r36229.  Reverting changes to corresponding tests made in in r36240 and
r36241.

Modified:
   trunk/lib/Parrot/Configure.pm
   trunk/t/configure/043-verbose_step.t
   trunk/t/configure/051-fatal_step.t

Modified: trunk/lib/Parrot/Configure.pm
==============================================================================
--- trunk/lib/Parrot/Configure.pm	Sun Feb  1 14:03:33 2009	(r36247)
+++ trunk/lib/Parrot/Configure.pm	Sun Feb  1 15:06:59 2009	(r36248)
@@ -303,7 +303,7 @@
         }
     }
     else {
-        die 'Argument to "fatal-step" option must be comma-delimited string of valid configuration steps';
+        die q{Argument to 'fatal-step' option must be comma-delimited string of valid configuration steps}; ## no critic
     }
     return %steps_to_die_for;
 }
@@ -323,7 +323,7 @@
         }
     }
     else {
-        die 'Argument to "verbose-step" option must be comma-delimited string of valid configuration steps';
+        die q{Argument to 'verbose-step' option must be comma-delimited string of valid configuration steps}; ## no critic
     }
     return %verbose_steps;
 }
@@ -374,7 +374,7 @@
 
     my $step_name   = $args->{task}->step;
 
-    eval "use $step_name;";
+    eval "use $step_name;"; ## no critic - runtime eval is what we want
     die $@ if $@;
 
     my $conftrace = [];

Modified: trunk/t/configure/043-verbose_step.t
==============================================================================
--- trunk/t/configure/043-verbose_step.t	Sun Feb  1 14:03:33 2009	(r36247)
+++ trunk/t/configure/043-verbose_step.t	Sun Feb  1 15:06:59 2009	(r36248)
@@ -77,7 +77,7 @@
 $conf->options->set(%args);
 eval { $conf->runsteps(); };
 like($@,
-    qr/Argument to ['"]verbose-step['"] option must be comma-delimited.*?steps/,
+    qr/Argument to 'verbose-step' option must be comma-delimited.*?steps/,
     "Got expected error message for bad value to --verbose-step"
 );
 

Modified: trunk/t/configure/051-fatal_step.t
==============================================================================
--- trunk/t/configure/051-fatal_step.t	Sun Feb  1 14:03:33 2009	(r36247)
+++ trunk/t/configure/051-fatal_step.t	Sun Feb  1 15:06:59 2009	(r36248)
@@ -109,7 +109,7 @@
 $conf->options->set( %{$args} );
 my $rv;
 eval { $rv = $conf->runsteps; };
-like($@, qr/^Argument to ["']fatal-step['"] option/,
+like($@, qr/^Argument to 'fatal-step' option/,
     "Got expected error message when value to --fatal-step option was misspecified");
 
 $conf->replenish($serialized);