[svn:parrot] r45380 - in trunk: config/auto t/steps/auto

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Fri Apr  2 11:09:23 2010
New Revision: 45380
URL: https://trac.parrot.org/parrot/changeset/45380

Log:
Reinstate tests to simulate Darwin.

Modified:
   trunk/config/auto/arch.pm
   trunk/t/steps/auto/arch-01.t

Modified: trunk/config/auto/arch.pm
==============================================================================
--- trunk/config/auto/arch.pm	Fri Apr  2 10:23:30 2010	(r45379)
+++ trunk/config/auto/arch.pm	Fri Apr  2 11:09:23 2010	(r45380)
@@ -29,6 +29,13 @@
     my %data;
     $data{description} = q{Determine CPU architecture and OS};
     $data{result}      = q{};
+    my $unamep;
+    eval {
+       chomp( $unamep  = `uname -p` );
+    };
+    $data{unamep} = (! $@ and $unamep)
+        ? $unamep
+        : undef;
     return \%data;
 }
 
@@ -60,9 +67,7 @@
     # the above split fails because archname is "darwin-thread-multi-2level".
     if ( $cpuarch =~ /darwin/ ) {
         $osname = 'darwin';
-        my $unamep = `uname -p`;
-        chomp $unamep;
-        $cpuarch = ( $unamep eq 'powerpc' )
+        $cpuarch = ( $self->{unamep} eq 'powerpc' )
             ? 'ppc'
             : 'i386';
     }

Modified: trunk/t/steps/auto/arch-01.t
==============================================================================
--- trunk/t/steps/auto/arch-01.t	Fri Apr  2 10:23:30 2010	(r45379)
+++ trunk/t/steps/auto/arch-01.t	Fri Apr  2 11:09:23 2010	(r45380)
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More qw(no_plan); # tests =>  81;
+use Test::More tests =>  83;
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::auto::arch');
@@ -16,8 +16,6 @@
 );
 use IO::CaptureOutput qw| capture |;
 
-########## Darwin special case ##########
-
 my ($args, $step_list_ref) = process_options( {
     argv => [ ],
     mode => q{configure},
@@ -33,6 +31,9 @@
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );
 my $step = test_step_constructor_and_description($conf);
+my $ret = $step->runstep($conf);
+ok( $ret, "runstep() returned true value" );
+is($step->result(), q{}, "Result was empty string as expected");
 
 $conf->replenish($serialized);
 
@@ -74,7 +75,7 @@
 $step = test_step_constructor_and_description($conf);
 my $pseudoarch = q{foobar};
 $conf->data->set('archname' => $pseudoarch);
-my $ret = $step->runstep($conf);
+$ret = $step->runstep($conf);
 ok( $ret, "runstep() returned true value: $pseudoarch" );
 is($step->result(), q{}, "Result was empty string as expected");
 is($conf->data->get('cpuarch'), q{},
@@ -84,53 +85,51 @@
 
 $conf->replenish($serialized);
 
-########### mock darwin ##########
-#
-#($args, $step_list_ref) = process_options( {
-#    argv => [ ],
-#    mode => q{configure},
-#} );
-#
-#$conf->add_steps($pkg);
-#$conf->options->set( %{$args} );
-#$step = test_step_constructor_and_description($conf);
-#$pseudoarch = q{darwin-thread-multi-2level};
-#$conf->data->set('archname' => $pseudoarch);
-#my $pseudobyteorder = 1234;
-#$conf->data->set('byteorder' => $pseudobyteorder);
-#$ret = $step->runstep($conf);
-#ok( $ret, "runstep() returned true value: $pseudoarch" );
-#is($step->result(), q{}, "Result was empty string as expected");
-#is($conf->data->get('cpuarch'), q{i386},
-#    "'cpuarch' was set as expected");
-#is($conf->data->get('osname'), q{darwin},
-#    "'osname' was set as expected");
-#
-#$conf->replenish($serialized);
-#
-########### mock darwin ##########
-#
-#($args, $step_list_ref) = process_options( {
-#    argv => [ ],
-#    mode => q{configure},
-#} );
-#
-#$conf->add_steps($pkg);
-#$conf->options->set( %{$args} );
-#$step = test_step_constructor_and_description($conf);
-#$pseudoarch = q{darwin-thread-multi-2level};
-#$conf->data->set('archname' => $pseudoarch);
-#$pseudobyteorder = 4321;
-#$conf->data->set('byteorder' => $pseudobyteorder);
-#$ret = $step->runstep($conf);
-#ok( $ret, "runstep() returned true value: $pseudoarch" );
-#is($step->result(), q{}, "Result was empty string as expected");
-#is($conf->data->get('cpuarch'), q{ppc},
-#    "'cpuarch' was set as expected");
-#is($conf->data->get('osname'), q{darwin},
-#    "'osname' was set as expected");
-#
-#$conf->replenish($serialized);
+########## mock darwin ##########
+
+($args, $step_list_ref) = process_options( {
+    argv => [ ],
+    mode => q{configure},
+} );
+
+$conf->add_steps($pkg);
+$conf->options->set( %{$args} );
+$step = test_step_constructor_and_description($conf);
+$step->{unamep} = 'powerpc';
+$pseudoarch = q{darwin-thread-multi-2level};
+$conf->data->set('archname' => $pseudoarch);
+$ret = $step->runstep($conf);
+ok( $ret, "runstep() returned true value: $pseudoarch" );
+is($step->result(), q{}, "Result was empty string as expected");
+is($conf->data->get('cpuarch'), q{ppc},
+    "'cpuarch' was set as expected");
+is($conf->data->get('osname'), q{darwin},
+    "'osname' was set as expected");
+
+$conf->replenish($serialized);
+
+######### mock darwin ##########
+
+($args, $step_list_ref) = process_options( {
+    argv => [ ],
+    mode => q{configure},
+} );
+
+$conf->add_steps($pkg);
+$conf->options->set( %{$args} );
+$step = test_step_constructor_and_description($conf);
+$step->{unamep} = 'i386';
+$pseudoarch = q{darwin-thread-multi-2level};
+$conf->data->set('archname' => $pseudoarch);
+$ret = $step->runstep($conf);
+ok( $ret, "runstep() returned true value: $pseudoarch" );
+is($step->result(), q{}, "Result was empty string as expected");
+is($conf->data->get('cpuarch'), q{i386},
+    "'cpuarch' was set as expected");
+is($conf->data->get('osname'), q{darwin},
+    "'osname' was set as expected");
+
+$conf->replenish($serialized);
 
 ########## mock win32 ##########