Author: jkeenan
Date: Tue Nov 25 14:58:37 2008
New Revision: 33210
Modified:
branches/rm_miniparrot/t/steps/auto_alignptrs-01.t
branches/rm_miniparrot/t/steps/auto_arch-01.t
branches/rm_miniparrot/t/steps/auto_cgoto-01.t
branches/rm_miniparrot/t/steps/auto_cpu-01.t
branches/rm_miniparrot/t/steps/auto_gcc-01.t
branches/rm_miniparrot/t/steps/auto_headers-01.t
branches/rm_miniparrot/t/steps/auto_jit-01.t
branches/rm_miniparrot/t/steps/auto_sizes-01.t
Log:
Eliminate tests for Configure.pl --miniparrot option, which is no longer being
offered.
Modified: branches/rm_miniparrot/t/steps/auto_alignptrs-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_alignptrs-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_alignptrs-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 22;
+use Test::More tests => 17;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -17,11 +17,12 @@
test_step_constructor_and_description
);
-########## --miniparrot ##########
+
+########## regular; singular ##########
my ($args, $step_list_ref) = process_options(
{
- argv => [ q{--miniparrot} ],
+ argv => [ ],
mode => q{configure},
}
);
@@ -30,35 +31,15 @@
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} );
my $step = test_step_constructor_and_description($conf);
-
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{skipped}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## regular; singular ##########
-
-($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);
my $align = 1;
$conf->data->set('ptr_alignment' => $align);
-$ret = $step->runstep($conf);
+my $ret = $step->runstep($conf);
ok( $ret, "runstep() returned true value" );
is($step->result(), qq{configured: $align byte}, "Expected result was set");
Modified: branches/rm_miniparrot/t/steps/auto_arch-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_arch-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_arch-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 110;
+use Test::More tests => 102;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -19,14 +19,13 @@
);
use IO::CaptureOutput qw| capture |;
-########## --miniparrot ##########
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--miniparrot} ],
- mode => q{configure},
- }
-);
+########## Darwin special case ##########
+
+my ($args, $step_list_ref) = process_options( {
+ argv => [ ],
+ mode => q{configure},
+} );
my $conf = Parrot::Configure->new;
@@ -35,26 +34,9 @@
test_step_thru_runstep( $conf, q{init::defaults}, $args );
my $pkg = q{auto::arch};
-
$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{skipped}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## Darwin special case ##########
-
-($args, $step_list_ref) = process_options( {
- 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);
my $errstr;
{
# As the t/configure/ test suite is currently (Dec 25 2007) constructed,
@@ -119,7 +101,7 @@
$step = test_step_constructor_and_description($conf);
my $pseudoarch = q{foobar};
$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
+my $ret = $step->runstep($conf);
ok( $ret, "runstep() returned true value" );
is($step->result(), q{}, "Result was empty string as expected");
is($conf->data->get('cpuarch'), q{},
Modified: branches/rm_miniparrot/t/steps/auto_cgoto-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_cgoto-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_cgoto-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 64;
+use Test::More tests => 56;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -19,42 +19,27 @@
);
use IO::CaptureOutput qw( capture );
-########### --miniparrot ###########
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--miniparrot} ],
- mode => q{configure},
- }
-);
+########### regular ###########
+
+my ($args, $step_list_ref) = process_options( {
+ argv => [ ],
+ mode => q{configure},
+} );
my $conf = Parrot::Configure->new;
my $serialized = $conf->pcfreeze();
test_step_thru_runstep( $conf, q{init::defaults}, $args );
+
my $pkg = q{auto::cgoto};
+
$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{skipped}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########### regular ###########
-
-($args, $step_list_ref) = process_options( {
- 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);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
ok(defined($step->result()), "A result was defined");
ok(defined($conf->data->get('TEMP_cg_h')), "An attribute has been defined");
ok(defined($conf->data->get('TEMP_cg_c')), "An attribute has been defined");
Modified: branches/rm_miniparrot/t/steps/auto_cpu-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_cpu-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_cpu-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 30;
+use Test::More tests => 22;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -19,14 +19,12 @@
);
use IO::CaptureOutput qw( capture );
-########### --miniparrot ###########
+########### --verbose ###########
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--miniparrot} ],
- mode => q{configure},
- }
-);
+my ($args, $step_list_ref) = process_options( {
+ argv => [ q{--verbose} ],
+ mode => q{configure},
+} );
my $conf = Parrot::Configure->new;
@@ -35,26 +33,9 @@
test_step_thru_runstep( $conf, q{init::defaults}, $args );
my $pkg = q{auto::cpu};
-
$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{skipped}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########### --verbose ###########
-
-($args, $step_list_ref) = process_options( {
- 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);
{
$conf->data->set('cpuarch' => 'foobar');
my ($ret, $stdout);
@@ -83,7 +64,7 @@
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
$conf->data->set('cpuarch' => 'foobar');
-$ret = $step->runstep($conf);
+my $ret = $step->runstep($conf);
ok($ret, "runstep() returned true value" );
ok(! $step->result(), "Got (default) false result as expected");
Modified: branches/rm_miniparrot/t/steps/auto_gcc-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_gcc-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_gcc-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 133;
+use Test::More tests => 123;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -267,29 +267,6 @@
$conf->replenish($serialized);
-########## _evaluate_gcc(); --miniparrot ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--miniparrot} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = q{3};
-$gnucref->{__GNUC_MINOR__} = q{1};
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undefined as expected");
-is($conf->data->get( 'ccwarn' ), q{-ansi -pedantic},
- "ccwarn set as expected for miniparrot");
-is($step->result(), q{yes}, "Got expected result");
-
-$conf->replenish($serialized);
-
########## _evaluate_gcc() ##########
($args, $step_list_ref) = process_options( {
Modified: branches/rm_miniparrot/t/steps/auto_headers-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_headers-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_headers-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 38;
+use Test::More tests => 30;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -19,11 +19,11 @@
);
use IO::CaptureOutput qw | capture |;
-########## --miniparrot ##########
+########## regular ##########
my ($args, $step_list_ref) = process_options(
{
- argv => [ q{--miniparrot} ],
+ argv => [ ],
mode => q{configure},
}
);
@@ -41,27 +41,6 @@
my $ret = $step->runstep($conf);
ok( $ret, "runstep() returned true value" );
-is($step->result(), q{skipped}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## regular ##########
-
-($args, $step_list_ref) = process_options(
- {
- 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);
-
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
is($step->result(), q{}, "Result is empty string as expected");
$conf->replenish($serialized);
Modified: branches/rm_miniparrot/t/steps/auto_jit-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_jit-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_jit-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 58;
+use Test::More tests => 50;
use Carp;
use Cwd;
use File::Path qw( mkpath );
@@ -23,12 +23,11 @@
);
use IO::CaptureOutput qw( capture );
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--miniparrot} ],
- mode => q{configure},
- }
-);
+
+my ($args, $step_list_ref) = process_options( {
+ argv => [ ],
+ mode => q{configure},
+} );
my $conf = Parrot::Configure->new;
@@ -37,24 +36,9 @@
test_step_thru_runstep( $conf, q{init::defaults}, $args );
my $pkg = q{auto::jit};
-
$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{skipped}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-($args, $step_list_ref) = process_options( {
- 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);
########### _check_jitcapability() ###########
Modified: branches/rm_miniparrot/t/steps/auto_sizes-01.t
==============================================================================
--- branches/rm_miniparrot/t/steps/auto_sizes-01.t (original)
+++ branches/rm_miniparrot/t/steps/auto_sizes-01.t Tue Nov 25 14:58:37 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 50;
+use Test::More qw(no_plan); # tests => 42;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -19,11 +19,12 @@
);
use IO::CaptureOutput qw | capture |;
-########## --miniparrot ##########
+
+########## _handle_intval_ptrsize_discrepancy() ##########
my ($args, $step_list_ref) = process_options(
{
- argv => [ q{--miniparrot} ],
+ argv => [ ],
mode => q{configure},
}
);
@@ -39,29 +40,6 @@
$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{using miniparrot defaults}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## _handle_intval_ptrsize_discrepancy() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-rerun_defaults_for_testing($conf, $args );
-
-$pkg = q{auto::sizes};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
{
my $stdout;
my %results = (
