[svn:parrot] r42259 - in branches/configtests/t/steps: auto init
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Thu Nov 5 03:48:36 UTC 2009
Author: jkeenan
Date: Thu Nov 5 03:48:34 2009
New Revision: 42259
URL: https://trac.parrot.org/parrot/changeset/42259
Log:
Continue to convert steps tests to use of Parrot configuration data.
Modified:
branches/configtests/t/steps/auto/alignptrs-01.t
branches/configtests/t/steps/auto/attributes-01.t
branches/configtests/t/steps/auto/backtrace-01.t
branches/configtests/t/steps/auto/gcc-01.t
branches/configtests/t/steps/auto/glibc-01.t
branches/configtests/t/steps/auto/msvc-01.t
branches/configtests/t/steps/auto/ops-01.t
branches/configtests/t/steps/auto/pmc-01.t
branches/configtests/t/steps/auto/warnings-01.t
branches/configtests/t/steps/init/optimize-01.t
Modified: branches/configtests/t/steps/auto/alignptrs-01.t
==============================================================================
--- branches/configtests/t/steps/auto/alignptrs-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/alignptrs-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -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::auto::alignptrs');
-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,12 +25,11 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $serialized = $conf->pcfreeze();
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
my $pkg = q{auto::alignptrs};
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
Modified: branches/configtests/t/steps/auto/attributes-01.t
==============================================================================
--- branches/configtests/t/steps/auto/attributes-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/attributes-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,15 +5,13 @@
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');
use_ok('config::auto::attributes');
-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 IO::CaptureOutput qw | capture |;
@@ -23,9 +21,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::attributes};
Modified: branches/configtests/t/steps/auto/backtrace-01.t
==============================================================================
--- branches/configtests/t/steps/auto/backtrace-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/backtrace-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,15 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 19;
+use Test::More tests => 14;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::backtrace');
-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
);
@@ -24,9 +22,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 ($task, $step_name, $step, $ret);
my $pkg = q{auto::backtrace};
Modified: branches/configtests/t/steps/auto/gcc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/gcc-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/gcc-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,17 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 122;
+use Test::More tests => 79;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::progs');
use_ok('config::auto::gcc');
-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 |;
@@ -27,13 +23,11 @@
mode => q{configure},
} );
-my $conf = Parrot::Configure->new();
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $serialized = $conf->pcfreeze();
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-test_step_thru_runstep($conf, q{inter::progs}, $args);
-
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
@@ -46,7 +40,6 @@
########## _evaluate_gcc() ##########
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -60,7 +53,6 @@
########## _evaluate_gcc() ##########
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -81,7 +73,6 @@
argv => [ q{--verbose} ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -106,7 +97,6 @@
argv => [],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -127,7 +117,6 @@
argv => [ q{--verbose} ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -148,7 +137,6 @@
########## _evaluate_gcc() ##########
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -176,7 +164,6 @@
argv => [],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -203,7 +190,6 @@
argv => [ q{--verbose} ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -231,7 +217,6 @@
argv => [ ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -251,7 +236,6 @@
argv => [ q{--maintainer}, q{--cage} ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
@@ -273,7 +257,6 @@
argv => [ ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set(%{$args});
$step = test_step_constructor_and_description($conf);
Modified: branches/configtests/t/steps/auto/glibc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/glibc-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/glibc-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,15 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 18;
+use Test::More tests => 13;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::glibc');
-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
);
@@ -24,9 +22,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 ($task, $step_name, $step, $ret);
my $pkg = q{auto::glibc};
Modified: branches/configtests/t/steps/auto/msvc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/msvc-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/msvc-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,15 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 43;
+use Test::More tests => 38;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::msvc');
-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 IO::CaptureOutput qw| capture |;
@@ -25,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::msvc};
Modified: branches/configtests/t/steps/auto/ops-01.t
==============================================================================
--- branches/configtests/t/steps/auto/ops-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/ops-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -9,10 +9,9 @@
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::ops');
-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,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::ops};
Modified: branches/configtests/t/steps/auto/pmc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/pmc-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/pmc-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,18 +5,16 @@
use strict;
use warnings;
-use Test::More tests => 28;
+use Test::More tests => 23;
use Carp;
use Cwd;
use File::Path qw| mkpath |;
use File::Temp qw| tempdir |;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::pmc');
-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
);
@@ -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{auto::pmc};
Modified: branches/configtests/t/steps/auto/warnings-01.t
==============================================================================
--- branches/configtests/t/steps/auto/warnings-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/auto/warnings-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -5,17 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 56;
+use Test::More tests => 41;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
use_ok('config::auto::warnings');
-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 IO::CaptureOutput qw | capture |;
@@ -27,11 +23,8 @@
}
);
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-test_step_thru_runstep( $conf, q{inter::progs}, $args );
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::warnings};
Modified: branches/configtests/t/steps/init/optimize-01.t
==============================================================================
--- branches/configtests/t/steps/init/optimize-01.t Thu Nov 5 03:45:05 2009 (r42258)
+++ branches/configtests/t/steps/init/optimize-01.t Thu Nov 5 03:48:34 2009 (r42259)
@@ -4,15 +4,13 @@
# init/optimize-01.t
use strict;
use warnings;
-use Test::More tests => 33;
+use Test::More tests => 28;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::init::optimize');
-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 IO::CaptureOutput qw | capture |;
@@ -24,9 +22,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{init::optimize};
More information about the parrot-commits
mailing list