[svn:parrot] r42343 - in branches/configtests: config/gen t/steps/gen

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sun Nov  8 00:51:29 2009
New Revision: 42343
URL: https://trac.parrot.org/parrot/changeset/42343

Log:
Convert config step from get_p5('OSNAME') to get('osname').  Convert corresponding configuration step test file.

Modified:
   branches/configtests/config/gen/platform.pm
   branches/configtests/t/steps/gen/platform-01.t

Modified: branches/configtests/config/gen/platform.pm
==============================================================================
--- branches/configtests/config/gen/platform.pm	Sat Nov  7 23:52:14 2009	(r42342)
+++ branches/configtests/config/gen/platform.pm	Sun Nov  8 00:51:29 2009	(r42343)
@@ -65,7 +65,7 @@
 sub _get_platform {
     my $self = shift;
     my ($conf, $verbose) = @_;
-    my $platform = lc ( $conf->data->get_p5('OSNAME') );
+    my $platform = lc ( $conf->data->get('osname') );
 
     $platform = "win32" if $platform =~ /^msys/;
     $platform = "win32" if $platform =~ /^mingw/;

Modified: branches/configtests/t/steps/gen/platform-01.t
==============================================================================
--- branches/configtests/t/steps/gen/platform-01.t	Sat Nov  7 23:52:14 2009	(r42342)
+++ branches/configtests/t/steps/gen/platform-01.t	Sun Nov  8 00:51:29 2009	(r42343)
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 19;
+use Test::More qw(no_plan); # tests => 19;
 use Carp;
 use Cwd;
 use File::Copy;
@@ -14,10 +14,9 @@
 use File::Spec;
 use lib qw( lib );
 use_ok('config::gen::platform');
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
+use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(
-    test_step_thru_runstep
     test_step_constructor_and_description
 );
 use Parrot::Configure::Utils qw( _slurp );
@@ -32,7 +31,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::platform};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );
@@ -41,27 +42,27 @@
 ok(-f $step->{platform_interface},
     "Located required platform interface header");
 
-my $platform_orig = $conf->data->get_p5('OSNAME');
+my $platform_orig = $conf->data->get('osname');
 my $archname_orig = $conf->data->get_p5('archname');
 $conf->data->set_p5( archname => 'foo-bar' );
 my $verbose = 0;
 
 ########## _get_platform() ##########
 
-$conf->data->set_p5( OSNAME => 'msys' );
+$conf->data->set( osname => 'msys' );
 is( $step->_get_platform( $conf, $verbose ), q{win32},
     "Got expected platform for msys");
 
-$conf->data->set_p5( OSNAME => 'mingw' );
+$conf->data->set( osname => 'mingw' );
 is( $step->_get_platform( $conf, $verbose ), q{win32},
     "Got expected platform for mingw");
 
-$conf->data->set_p5( OSNAME => 'MSWin32' );
+$conf->data->set( osname => 'MSWin32' );
 is( $step->_get_platform( $conf, $verbose ), q{win32},
     "Got expected platform for MSWin32");
 
 # re-set to original values
-$conf->data->set_p5( OSNAME => $platform_orig );
+$conf->data->set( osname => $platform_orig );
 $conf->data->set_p5( archname => $archname_orig );
 
 $conf->data->set_p5( archname => 'ia64-bar' );
@@ -69,7 +70,7 @@
     "Got expected platform for ia64");
 
 $conf->data->set_p5( archname => 'foo-bar' );
-$conf->data->set_p5( OSNAME => 'foo' );
+$conf->data->set( osname => 'foo' );
 {
     $verbose = 1;
     my ($stdout, $stderr, $rv);
@@ -85,7 +86,7 @@
 
 # re-set to original values
 $conf->data->set_p5( archname => $archname_orig );
-$conf->data->set_p5( OSNAME => $platform_orig );
+$conf->data->set( osname => $platform_orig );
 
 ########## _get_generated() ##########