[svn:parrot] r42255 - branches/configtests/t/steps/inter

jkeenan at svn.parrot.org jkeenan at svn.parrot.org
Thu Nov 5 01:37:10 UTC 2009


Author: jkeenan
Date: Thu Nov  5 01:37:08 2009
New Revision: 42255
URL: https://trac.parrot.org/parrot/changeset/42255

Log:
Continue converting step tests to use all Parrot configuration data.

Modified:
   branches/configtests/t/steps/inter/charset-01.t
   branches/configtests/t/steps/inter/encoding-01.t
   branches/configtests/t/steps/inter/lex-01.t
   branches/configtests/t/steps/inter/lex-02.t
   branches/configtests/t/steps/inter/lex-03.t
   branches/configtests/t/steps/inter/libparrot-01.t
   branches/configtests/t/steps/inter/progs-01.t
   branches/configtests/t/steps/inter/progs-02.t
   branches/configtests/t/steps/inter/progs-03.t
   branches/configtests/t/steps/inter/progs-04.t
   branches/configtests/t/steps/inter/shlibs-01.t
   branches/configtests/t/steps/inter/types-01.t
   branches/configtests/t/steps/inter/yacc-01.t
   branches/configtests/t/steps/inter/yacc-02.t

Modified: branches/configtests/t/steps/inter/charset-01.t
==============================================================================
--- branches/configtests/t/steps/inter/charset-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/charset-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,15 +5,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 17;
+use Test::More tests => 12;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::inter::charset');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -27,9 +25,8 @@
     }
 );
 
-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{inter::charset};
 

Modified: branches/configtests/t/steps/inter/encoding-01.t
==============================================================================
--- branches/configtests/t/steps/inter/encoding-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/encoding-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,15 +5,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 17;
+use Test::More tests => 12;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::inter::encoding');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -27,9 +25,8 @@
     }
 );
 
-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{inter::encoding};
 

Modified: branches/configtests/t/steps/inter/lex-01.t
==============================================================================
--- branches/configtests/t/steps/inter/lex-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/lex-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -10,7 +10,6 @@
 use Data::Dumper;
 use lib qw( lib t/configure/testlib );
 use_ok('config::inter::lex');
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
 use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(

Modified: branches/configtests/t/steps/inter/lex-02.t
==============================================================================
--- branches/configtests/t/steps/inter/lex-02.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/lex-02.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,16 +5,14 @@
 
 use strict;
 use warnings;
-use Test::More tests =>  12;
+use Test::More tests =>   7;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 $ENV{TEST_LEX} = 'foobar';
 use_ok('config::inter::lex');
-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,8 @@
     }
 );
 
-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{inter::lex};
 

Modified: branches/configtests/t/steps/inter/lex-03.t
==============================================================================
--- branches/configtests/t/steps/inter/lex-03.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/lex-03.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,16 +5,14 @@
 
 use strict;
 use warnings;
-use Test::More tests =>  14;
+use Test::More tests =>   9;
 use Carp;
 use Data::Dumper;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::inter::lex');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -28,9 +26,9 @@
         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 @prompts = q{flex};
 my $object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;

Modified: branches/configtests/t/steps/inter/libparrot-01.t
==============================================================================
--- branches/configtests/t/steps/inter/libparrot-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/libparrot-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,16 +5,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 58;
+use Test::More tests => 48;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
 use_ok('config::inter::libparrot');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -28,10 +25,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{inter::libparrot};
 

Modified: branches/configtests/t/steps/inter/progs-01.t
==============================================================================
--- branches/configtests/t/steps/inter/progs-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/progs-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -10,7 +10,6 @@
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::inter::progs');
-use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
 use Parrot::Configure::Step::Test;
 use Parrot::Configure::Test qw(

Modified: branches/configtests/t/steps/inter/progs-02.t
==============================================================================
--- branches/configtests/t/steps/inter/progs-02.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/progs-02.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -6,17 +6,13 @@
 use strict;
 use warnings;
 
-use Test::More tests => 24;
+use Test::More tests =>  9;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
 use_ok('config::inter::progs');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -38,11 +34,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install},  $args );
-test_step_thru_runstep( $conf, q{init::hints},    $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{inter::progs};
 

Modified: branches/configtests/t/steps/inter/progs-03.t
==============================================================================
--- branches/configtests/t/steps/inter/progs-03.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/progs-03.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -6,17 +6,13 @@
 use strict;
 use warnings;
 
-use Test::More tests => 24;
+use Test::More tests =>  9;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
 use_ok('config::inter::progs');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -37,11 +33,9 @@
         mode => q{configure},
     }
 );
-my $conf = Parrot::Configure->new;
 
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install},  $args );
-test_step_thru_runstep( $conf, q{init::hints},    $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{inter::progs};
 

Modified: branches/configtests/t/steps/inter/progs-04.t
==============================================================================
--- branches/configtests/t/steps/inter/progs-04.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/progs-04.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -6,17 +6,13 @@
 use strict;
 use warnings;
 
-use Test::More tests => 23;
+use Test::More tests =>  8;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
 use_ok('config::inter::progs');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -38,11 +34,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install},  $args );
-test_step_thru_runstep( $conf, q{init::hints},    $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{inter::progs};
 

Modified: branches/configtests/t/steps/inter/shlibs-01.t
==============================================================================
--- branches/configtests/t/steps/inter/shlibs-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/shlibs-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,15 +5,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 21;
+use Test::More tests => 16;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::inter::shlibs');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -27,9 +25,8 @@
     }
 );
 
-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{inter::shlibs};
 $conf->add_steps($pkg);

Modified: branches/configtests/t/steps/inter/types-01.t
==============================================================================
--- branches/configtests/t/steps/inter/types-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/types-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -9,10 +9,9 @@
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::inter::types');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -26,7 +25,8 @@
     }
 );
 
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
 
 my $pkg = q{inter::types};
 

Modified: branches/configtests/t/steps/inter/yacc-01.t
==============================================================================
--- branches/configtests/t/steps/inter/yacc-01.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/yacc-01.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,16 +5,14 @@
 
 use strict;
 use warnings;
-use Test::More tests => 31;
+use Test::More tests => 26;
 use Carp;
 use Data::Dumper;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 use_ok('config::inter::yacc');
-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 Tie::Filehandle::Preempt::Stdin;
@@ -29,9 +27,8 @@
     }
 );
 
-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{inter::yacc};
 

Modified: branches/configtests/t/steps/inter/yacc-02.t
==============================================================================
--- branches/configtests/t/steps/inter/yacc-02.t	Wed Nov  4 19:41:45 2009	(r42254)
+++ branches/configtests/t/steps/inter/yacc-02.t	Thu Nov  5 01:37:08 2009	(r42255)
@@ -5,16 +5,14 @@
 
 use strict;
 use warnings;
-use Test::More tests =>  12;
+use Test::More tests =>   7;
 use Carp;
 use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
 $ENV{TEST_YACC} = 'foobar';
 use_ok('config::inter::yacc');
-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,8 @@
     }
 );
 
-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{inter::yacc};
 


More information about the parrot-commits mailing list