[svn:parrot] r42345 - in branches/configtests/t/steps: auto gen

jkeenan at svn.parrot.org jkeenan at svn.parrot.org
Sun Nov 8 01:00:11 UTC 2009


Author: jkeenan
Date: Sun Nov  8 01:00:08 2009
New Revision: 42345
URL: https://trac.parrot.org/parrot/changeset/42345

Log:
Continue to convert steps tests to use of Parrot configuration data.  The
following tests are either running with warnings or experiencing test failures
(F) because their corresponding config step classes still use
'$conf->data->get_p5('some_attribute')'.:

t/steps/init/optimize-01.t
t/steps/auto/alignptrs-02.t (F)
t/steps/auto/headers-01.t
t/steps/auto/signal-01.t
t/steps/auto/perldoc-01.t
t/steps/auto/pod2man-01.t

Modified:
   branches/configtests/t/steps/auto/perldoc-01.t
   branches/configtests/t/steps/auto/pod2man-01.t
   branches/configtests/t/steps/gen/call_list-01.t
   branches/configtests/t/steps/gen/config_h-01.t
   branches/configtests/t/steps/gen/config_pm-01.t
   branches/configtests/t/steps/gen/core_pmcs-01.t
   branches/configtests/t/steps/gen/crypto-01.t
   branches/configtests/t/steps/gen/makefiles-01.t
   branches/configtests/t/steps/gen/opengl-01.t
   branches/configtests/t/steps/gen/parrot_include-01.t

Modified: branches/configtests/t/steps/auto/perldoc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/perldoc-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/auto/perldoc-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -5,20 +5,16 @@
 
 use strict;
 use warnings;
-use Test::More tests => 32;
+use Test::More tests => 27;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::auto::perldoc');
 use Parrot::BuildUtil;
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
+use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(
-    test_step_thru_runstep
-    rerun_defaults_for_testing
     test_step_constructor_and_description
 );
-use IO::CaptureOutput qw| capture |;
 
 ########## regular ##########
 
@@ -27,9 +23,8 @@
     mode            => q{configure},
 } );
 
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{auto::perldoc};
 

Modified: branches/configtests/t/steps/auto/pod2man-01.t
==============================================================================
--- branches/configtests/t/steps/auto/pod2man-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/auto/pod2man-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -5,20 +5,16 @@
 
 use strict;
 use warnings;
-use Test::More tests => 15;
+use Test::More tests => 10;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::auto::pod2man');
 use Parrot::BuildUtil;
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
+use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(
-    test_step_thru_runstep
-    rerun_defaults_for_testing
     test_step_constructor_and_description
 );
-use IO::CaptureOutput qw| capture |;
 
 ########## regular ##########
 
@@ -27,9 +23,8 @@
     mode            => q{configure},
 } );
 
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{auto::pod2man};
 

Modified: branches/configtests/t/steps/gen/call_list-01.t
==============================================================================
--- branches/configtests/t/steps/gen/call_list-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/call_list-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -9,10 +9,9 @@
 use Carp;
 use lib qw( lib );
 use_ok('config::gen::call_list');
-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
 );
 
@@ -25,7 +24,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::call_list};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );

Modified: branches/configtests/t/steps/gen/config_h-01.t
==============================================================================
--- branches/configtests/t/steps/gen/config_h-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/config_h-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -11,11 +11,9 @@
 use File::Temp qw( tempdir );
 use lib qw( lib );
 use_ok('config::gen::config_h');
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
+use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(
-    test_step_thru_runstep
-    rerun_defaults_for_testing
     test_step_constructor_and_description
 );
 use Parrot::Configure::Utils qw( _slurp );
@@ -29,7 +27,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $serialized = $conf->pcfreeze();
 

Modified: branches/configtests/t/steps/gen/config_pm-01.t
==============================================================================
--- branches/configtests/t/steps/gen/config_pm-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/config_pm-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -9,10 +9,9 @@
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::gen::config_pm');
-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
 );
 
@@ -25,7 +24,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::config_pm};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );

Modified: branches/configtests/t/steps/gen/core_pmcs-01.t
==============================================================================
--- branches/configtests/t/steps/gen/core_pmcs-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/core_pmcs-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -5,16 +5,14 @@
 
 use strict;
 use warnings;
-use Test::More tests => 16;
+use Test::More tests =>  7;
 use Carp;
 use lib qw( lib );
-use_ok('init::defaults');
 use_ok('auto::pmc');
 use_ok('config::gen::core_pmcs');
-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
 );
 
@@ -27,9 +25,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{auto::pmc}, $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::core_pmcs};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );

Modified: branches/configtests/t/steps/gen/crypto-01.t
==============================================================================
--- branches/configtests/t/steps/gen/crypto-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/crypto-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -9,11 +9,9 @@
 use Carp;
 use lib qw( lib );
 use_ok('config::gen::crypto');
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
+use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(
-    test_step_thru_runstep
-    rerun_defaults_for_testing
     test_step_constructor_and_description
 );
 
@@ -26,7 +24,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $serialized = $conf->pcfreeze();
 

Modified: branches/configtests/t/steps/gen/makefiles-01.t
==============================================================================
--- branches/configtests/t/steps/gen/makefiles-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/makefiles-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -83,10 +83,9 @@
 
 use_ok('config::gen::makefiles');
 
-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
 );
 
@@ -99,7 +98,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new();
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 my $pkg  = 'gen::makefiles';
 
 $conf->add_steps($pkg);

Modified: branches/configtests/t/steps/gen/opengl-01.t
==============================================================================
--- branches/configtests/t/steps/gen/opengl-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/opengl-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -9,10 +9,9 @@
 use Carp;
 use lib qw( lib );
 use_ok('config::gen::opengl');
-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
 );
 
@@ -25,7 +24,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::opengl};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );

Modified: branches/configtests/t/steps/gen/parrot_include-01.t
==============================================================================
--- branches/configtests/t/steps/gen/parrot_include-01.t	Sun Nov  8 00:52:28 2009	(r42344)
+++ branches/configtests/t/steps/gen/parrot_include-01.t	Sun Nov  8 01:00:08 2009	(r42345)
@@ -9,10 +9,9 @@
 use Carp;
 use lib qw( lib );
 use_ok('config::gen::parrot_include');
-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
 );
 
@@ -25,7 +24,9 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
+
 my $pkg = q{gen::parrot_include};
 $conf->add_steps($pkg);
 $conf->options->set( %{$args} );


More information about the parrot-commits mailing list