[svn:parrot] r42592 - in trunk: config/inter t/steps/inter

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Fri Nov 20 02:34:56 2009
New Revision: 42592
URL: https://trac.parrot.org/parrot/changeset/42592

Log:
Eliminate an unnecessary internal sub in inter::progs.  Touch up its verbose output.  Adjust steps tests accordingly.

Modified:
   trunk/config/inter/progs.pm
   trunk/t/steps/inter/progs-01.t
   trunk/t/steps/inter/progs-02.t
   trunk/t/steps/inter/progs-03.t

Modified: trunk/config/inter/progs.pm
==============================================================================
--- trunk/config/inter/progs.pm	Fri Nov 20 02:32:28 2009	(r42591)
+++ trunk/config/inter/progs.pm	Fri Nov 20 02:34:56 2009	(r42592)
@@ -34,12 +34,10 @@
 sub runstep {
     my ( $self, $conf ) = @_;
 
-    my $verbose = _get_verbose($conf);
-
     my $ask = _prepare_for_interactivity($conf);
 
     my $cc;
-    ($conf, $cc) = _get_programs($conf, $verbose, $ask);
+    ($conf, $cc) = _get_programs($conf, $ask);
 
     my $debug = _get_debug($conf, $ask);
 
@@ -55,13 +53,6 @@
     return 1;
 }
 
-sub _get_verbose {
-    my $conf = shift;
-    my $verbose = $conf->options->get('verbose');
-    print "\n" if $verbose;
-    return $verbose;
-}
-
 sub _prepare_for_interactivity {
     my $conf = shift;
     my $ask = $conf->options->get('ask');
@@ -81,7 +72,7 @@
 }
 
 sub _get_programs {
-    my ($conf, $verbose, $ask) = @_;
+    my ($conf, $ask) = @_;
     # Set each variable individually so that hints files can use them as
     # triggers to help pick the correct defaults for later answers.
     my ( $cc, $cxx, $link, $ld, $ccflags, $linkflags, $ldflags, $libs, $lex, $yacc );
@@ -109,7 +100,7 @@
         if $ask;
     $conf->data->set( ccflags => $ccflags );
 
-    $verbose and print " ccflags: $ccflags\n";
+    $conf->options->get('verbose') and print "\nccflags: $ccflags\n";
 
     $linkflags = $conf->data->get('linkflags');
     $linkflags =~ s/-libpath:\S+//g;    # TT #854: No idea why.

Modified: trunk/t/steps/inter/progs-01.t
==============================================================================
--- trunk/t/steps/inter/progs-01.t	Fri Nov 20 02:32:28 2009	(r42591)
+++ trunk/t/steps/inter/progs-01.t	Fri Nov 20 02:34:56 2009	(r42592)
@@ -70,10 +70,9 @@
 isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
 
 capture( sub {
-    my $verbose = inter::progs::_get_verbose($conf);
     my $ask = inter::progs::_prepare_for_interactivity($conf);
     my $cc;
-    ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
+    ($conf, $cc) = inter::progs::_get_programs($conf, $ask);
     $debug = inter::progs::_get_debug($conf, $ask);
     $debug_validity = inter::progs::_is_debug_setting_valid($debug);
 }, \$stdout);

Modified: trunk/t/steps/inter/progs-02.t
==============================================================================
--- trunk/t/steps/inter/progs-02.t	Fri Nov 20 02:32:28 2009	(r42591)
+++ trunk/t/steps/inter/progs-02.t	Fri Nov 20 02:34:56 2009	(r42592)
@@ -70,10 +70,9 @@
 isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
 
 capture( sub {
-    my $verbose = inter::progs::_get_verbose($conf);
     my $ask = inter::progs::_prepare_for_interactivity($conf);
     my $cc;
-    ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
+    ($conf, $cc) = inter::progs::_get_programs($conf, $ask);
     $debug = inter::progs::_get_debug($conf, $ask);
     $debug_validity = inter::progs::_is_debug_setting_valid($debug);
 }, \$stdout);

Modified: trunk/t/steps/inter/progs-03.t
==============================================================================
--- trunk/t/steps/inter/progs-03.t	Fri Nov 20 02:32:28 2009	(r42591)
+++ trunk/t/steps/inter/progs-03.t	Fri Nov 20 02:34:56 2009	(r42592)
@@ -70,10 +70,9 @@
 isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
 
 capture( sub {
-    my $verbose = inter::progs::_get_verbose($conf);
     my $ask = inter::progs::_prepare_for_interactivity($conf);
     my $cc;
-    ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
+    ($conf, $cc) = inter::progs::_get_programs($conf, $ask);
     $debug = inter::progs::_get_debug($conf, $ask);
     $debug_validity = inter::progs::_is_debug_setting_valid($debug);
 }, \$stdout);