Author: jkeenan
Date: Sat Feb 16 17:59:53 2008
New Revision: 25781
Modified:
branches/tcif/t/steps/auto_gcc-01.t
branches/tcif/t/steps/auto_gcc-02.t
branches/tcif/t/steps/auto_gcc-03.t
branches/tcif/t/steps/auto_gcc-04.t
branches/tcif/t/steps/auto_gcc-05.t
branches/tcif/t/steps/auto_gcc-06.t
branches/tcif/t/steps/auto_gcc-07.t
branches/tcif/t/steps/auto_gcc-08.t
branches/tcif/t/steps/auto_gcc-09.t
branches/tcif/t/steps/auto_gcc-10.t
branches/tcif/t/steps/auto_gcc-11.t
branches/tcif/t/steps/auto_gcc-12.t
branches/tcif/t/steps/auto_gcc-13.t
Log:
Revising test to eliminate reliance on init::defaults and use
Parrot::Configure::Parallel::Trace instead.
Modified: branches/tcif/t/steps/auto_gcc-01.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-01.t (original)
+++ branches/tcif/t/steps/auto_gcc-01.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,17 @@
use strict;
use warnings;
-use Test::More tests => 17;
+use Test::More tests => 9;
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::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 1, "Step stored");
my $args = process_options( {
argv => [],
@@ -21,16 +23,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-test_step_thru_runstep( $conf, q{inter::progs}, $args );
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[2];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-02.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-02.t (original)
+++ branches/tcif/t/steps/auto_gcc-02.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 12;
+use Test::More tests => 9;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-03.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-03.t (original)
+++ branches/tcif/t/steps/auto_gcc-03.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 13;
+use Test::More tests => 10;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-04.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-04.t (original)
+++ branches/tcif/t/steps/auto_gcc-04.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,20 @@
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More tests => 12;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::Configure::Test qw( test_step_thru_runstep);
use IO::CaptureOutput qw | capture |;
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--verbose} ],
@@ -21,15 +26,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-05.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-05.t (original)
+++ branches/tcif/t/steps/auto_gcc-05.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 13;
+use Test::More tests => 10;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-06.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-06.t (original)
+++ branches/tcif/t/steps/auto_gcc-06.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,19 @@
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More tests => 12;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
use IO::CaptureOutput qw | capture |;
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--verbose} ],
@@ -21,15 +25,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-07.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-07.t (original)
+++ branches/tcif/t/steps/auto_gcc-07.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,19 @@
use strict;
use warnings;
-use Test::More tests => 16;
+use Test::More tests => 13;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
use IO::CaptureOutput qw | capture |;
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--verbose} ],
@@ -21,15 +25,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-08.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-08.t (original)
+++ branches/tcif/t/steps/auto_gcc-08.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,19 @@
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More tests => 12;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
use IO::CaptureOutput qw | capture |;
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [],
@@ -21,15 +25,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-09.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-09.t (original)
+++ branches/tcif/t/steps/auto_gcc-09.t Sat Feb 16 17:59:53 2008
@@ -5,15 +5,19 @@
use strict;
use warnings;
-use Test::More tests => 16;
+use Test::More tests => 13;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
use IO::CaptureOutput qw | capture |;
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--verbose} ],
@@ -21,15 +25,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-10.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-10.t (original)
+++ branches/tcif/t/steps/auto_gcc-10.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 11;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ ],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-11.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-11.t (original)
+++ branches/tcif/t/steps/auto_gcc-11.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 11;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--maintainer}, q{--cage} ],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-12.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-12.t (original)
+++ branches/tcif/t/steps/auto_gcc-12.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More tests => 12;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ q{--miniparrot} ],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
Modified: branches/tcif/t/steps/auto_gcc-13.t
==============================================================================
--- branches/tcif/t/steps/auto_gcc-13.t (original)
+++ branches/tcif/t/steps/auto_gcc-13.t Sat Feb 16 17:59:53 2008
@@ -5,14 +5,18 @@
use strict;
use warnings;
-use Test::More tests => 16;
+use Test::More tests => 13;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gcc');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Parallel::Trace;
+
+my $trace = Parrot::Configure::Parallel::Trace->new($0);
+ok(defined $trace, "Parallel::Trace constructor succeeded");
+is($trace->store_this_step(), 2,
+ "Step stored; has previously been tested");
my $args = process_options( {
argv => [ ],
@@ -20,15 +24,14 @@
} );
my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
+$conf->refresh($trace->get_previous_state());
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::gcc};
$conf->add_steps($pkg);
$conf->options->set(%{$args});
-$task = $conf->steps->[1];
+$task = $conf->steps->[-1];
$step_name = $task->step;
$step = $step_name->new();
