[svn:parrot] r42574 - in branches/configtests: config/auto config/init t/steps/auto

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Nov 19 00:31:36 2009
New Revision: 42574
URL: https://trac.parrot.org/parrot/changeset/42574

Log:
Correct overuse of '_provisional', particularly with respect to elements used in auto::headers.

Modified:
   branches/configtests/config/auto/headers.pm
   branches/configtests/config/init/defaults.pm
   branches/configtests/t/steps/auto/headers-01.t

Modified: branches/configtests/config/auto/headers.pm
==============================================================================
--- branches/configtests/config/auto/headers.pm	Thu Nov 19 00:29:55 2009	(r42573)
+++ branches/configtests/config/auto/headers.pm	Thu Nov 19 00:31:36 2009	(r42574)
@@ -78,9 +78,12 @@
     # probing ourselves
     my %mapping = ( i_niin => "i_netinetin" );
 
+#    for ( grep { /^i_/ } $conf->data->keys_p5() ) {
+#        $conf->data->set( $mapping{$_} || $_ =>
+#            $conf->data->get( $_ . q{_provisional} ) );
+#    }
     for ( grep { /^i_/ } $conf->data->keys_p5() ) {
-        $conf->data->set( $mapping{$_} || $_ =>
-            $conf->data->get( $_ . q{_provisional} ) );
+        $conf->data->set( $mapping{$_} || $_ => $conf->data->get_p5($_) );
     }
 }
 

Modified: branches/configtests/config/init/defaults.pm
==============================================================================
--- branches/configtests/config/init/defaults.pm	Thu Nov 19 00:29:55 2009	(r42573)
+++ branches/configtests/config/init/defaults.pm	Thu Nov 19 00:31:36 2009	(r42574)
@@ -92,8 +92,11 @@
     }
 
     # Stage 2 (anticipating needs of config/auto/headers.pm):
-    $conf->data->set(
-        map { $_ . q{_provisional} => $Config{$_} } grep { /^i_/ } keys %Config
+#    $conf->data->set(
+#        map { $_ . q{_provisional} => $Config{$_} } grep { /^i_/ } keys %Config
+#    );
+    $conf->data->set_p5(
+        map { $_ => $Config{$_} } grep { /^i_/ } keys %Config
     );
 
     # Stage 3 (Along similar lines, look up values from Perl 5 special

Modified: branches/configtests/t/steps/auto/headers-01.t
==============================================================================
--- branches/configtests/t/steps/auto/headers-01.t	Thu Nov 19 00:29:55 2009	(r42573)
+++ branches/configtests/t/steps/auto/headers-01.t	Thu Nov 19 00:31:36 2009	(r42574)
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More qw(no_plan); # tests =>  30;
+use Test::More tests =>  19;
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::auto::headers');