[svn:parrot] r42297 - in branches/configtests: config/auto t/steps/auto
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Fri Nov 6 02:58:01 UTC 2009
Author: jkeenan
Date: Fri Nov 6 02:57:57 2009
New Revision: 42297
URL: https://trac.parrot.org/parrot/changeset/42297
Log:
Continue to convert steps tests to use of Parrot configuration data. Some of these test files have failures or expose bugs for the first time.
Modified:
branches/configtests/config/auto/crypto.pm
branches/configtests/config/auto/gdbm.pm
branches/configtests/config/auto/gettext.pm
branches/configtests/config/auto/gmp.pm
branches/configtests/config/auto/opengl.pm
branches/configtests/config/auto/pcre.pm
branches/configtests/config/auto/readline.pm
branches/configtests/t/steps/auto/alignptrs-02.t
branches/configtests/t/steps/auto/arch-01.t
branches/configtests/t/steps/auto/byteorder-01.t
branches/configtests/t/steps/auto/cgoto-01.t
branches/configtests/t/steps/auto/cpu-01.t
branches/configtests/t/steps/auto/crypto-01.t
branches/configtests/t/steps/auto/format-01.t
branches/configtests/t/steps/auto/frames-01.t
branches/configtests/t/steps/auto/gc-01.t
branches/configtests/t/steps/auto/gdbm-01.t
branches/configtests/t/steps/auto/gettext-01.t
branches/configtests/t/steps/auto/gmp-01.t
branches/configtests/t/steps/auto/headers-01.t
branches/configtests/t/steps/auto/inline-01.t
branches/configtests/t/steps/auto/isreg-01.t
branches/configtests/t/steps/auto/jit-01.t
branches/configtests/t/steps/auto/memalign-01.t
branches/configtests/t/steps/auto/neg_0-01.t
branches/configtests/t/steps/auto/opengl-01.t
branches/configtests/t/steps/auto/pcre-01.t
branches/configtests/t/steps/auto/readline-01.t
branches/configtests/t/steps/auto/readline-02.t
branches/configtests/t/steps/auto/signal-01.t
branches/configtests/t/steps/auto/sizes-01.t
branches/configtests/t/steps/auto/socklen_t-01.t
branches/configtests/t/steps/auto/va_ptr-01.t
Modified: branches/configtests/config/auto/crypto.pm
==============================================================================
--- branches/configtests/config/auto/crypto.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/crypto.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -47,7 +47,7 @@
return 1;
}
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/gdbm.pm
==============================================================================
--- branches/configtests/config/auto/gdbm.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/gdbm.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -50,7 +50,7 @@
return 1;
}
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/gettext.pm
==============================================================================
--- branches/configtests/config/auto/gettext.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/gettext.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -50,7 +50,7 @@
return 1;
}
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/gmp.pm
==============================================================================
--- branches/configtests/config/auto/gmp.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/gmp.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -56,7 +56,7 @@
return 1;
}
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/opengl.pm
==============================================================================
--- branches/configtests/config/auto/opengl.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/opengl.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -167,7 +167,8 @@
return $self->_handle_no_opengl($conf) if $without;
- my $osname = $conf->data->get_p5('OSNAME');
+# my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/pcre.pm
==============================================================================
--- branches/configtests/config/auto/pcre.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/pcre.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -46,7 +46,7 @@
return 1;
}
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/config/auto/readline.pm
==============================================================================
--- branches/configtests/config/auto/readline.pm Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/config/auto/readline.pm Fri Nov 6 02:57:57 2009 (r42297)
@@ -39,7 +39,7 @@
my $verbose = $conf->options->get('verbose');
my $cc = $conf->data->get('cc');
- my $osname = $conf->data->get_p5('OSNAME');
+ my $osname = $conf->data->get('osname');
my $extra_libs = $self->_select_lib( {
conf => $conf,
Modified: branches/configtests/t/steps/auto/alignptrs-02.t
==============================================================================
--- branches/configtests/t/steps/auto/alignptrs-02.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/alignptrs-02.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,15 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 18;
+use Test::More qw(no_plan); # tests => 18;
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
);
@@ -26,9 +24,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::alignptrs};
Modified: branches/configtests/t/steps/auto/arch-01.t
==============================================================================
--- branches/configtests/t/steps/auto/arch-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/arch-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 102;
+use Test::More tests => 70;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::arch');
-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 |;
@@ -26,12 +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 );
-
my $pkg = q{auto::arch};
$conf->add_steps($pkg);
@@ -69,7 +65,7 @@
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);
@@ -95,7 +91,7 @@
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);
@@ -117,7 +113,7 @@
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);
@@ -141,7 +137,7 @@
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);
@@ -165,7 +161,7 @@
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);
@@ -187,7 +183,7 @@
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);
@@ -209,7 +205,7 @@
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);
@@ -231,7 +227,7 @@
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);
@@ -253,7 +249,7 @@
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/byteorder-01.t
==============================================================================
--- branches/configtests/t/steps/auto/byteorder-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/byteorder-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -9,10 +9,9 @@
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::byteorder');
-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::byteorder};
Modified: branches/configtests/t/steps/auto/cgoto-01.t
==============================================================================
--- branches/configtests/t/steps/auto/cgoto-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/cgoto-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 56;
+use Test::More tests => 45;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::cgoto');
-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,12 +24,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 );
-
my $pkg = q{auto::cgoto};
$conf->add_steps($pkg);
@@ -55,7 +51,7 @@
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);
@@ -93,7 +89,7 @@
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/cpu-01.t
==============================================================================
--- branches/configtests/t/steps/auto/cpu-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/cpu-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 22;
+use Test::More qw(no_plan); # tests => 22;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::cpu');
-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 );
@@ -26,12 +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 );
-
my $pkg = q{auto::cpu};
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
@@ -59,7 +55,7 @@
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/crypto-01.t
==============================================================================
--- branches/configtests/t/steps/auto/crypto-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/crypto-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -8,11 +8,9 @@
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::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
);
use IO::CaptureOutput qw( capture );
@@ -26,7 +24,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::crypto};
Modified: branches/configtests/t/steps/auto/format-01.t
==============================================================================
--- branches/configtests/t/steps/auto/format-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/format-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -10,10 +10,9 @@
use lib qw( lib t/configure/testlib );
use_ok('config::auto::format');
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
test_step_constructor_and_description
);
@@ -24,7 +23,8 @@
mode => q{configure},
} );
-my $conf = Parrot::Configure->new();
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my ($task, $step_name, $step, $ret);
my $pkg = q{auto::format};
Modified: branches/configtests/t/steps/auto/frames-01.t
==============================================================================
--- branches/configtests/t/steps/auto/frames-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/frames-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,14 +5,12 @@
use strict;
use warnings;
-use Test::More tests => 27;
+use Test::More tests => 22;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::frames');
-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
);
@@ -22,12 +20,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 );
-
my $pkg = q{auto::frames};
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
Modified: branches/configtests/t/steps/auto/gc-01.t
==============================================================================
--- branches/configtests/t/steps/auto/gc-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/gc-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -8,11 +8,9 @@
use Test::More tests => 8;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::gc');
-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 |;
@@ -26,7 +24,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::gc};
Modified: branches/configtests/t/steps/auto/gdbm-01.t
==============================================================================
--- branches/configtests/t/steps/auto/gdbm-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/gdbm-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,19 +5,16 @@
use strict;
use warnings;
-use Test::More tests => 40;
+use Test::More tests => 29;
use Carp;
use Cwd;
use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gdbm');
-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 |;
@@ -37,12 +34,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 );
-
my $pkg = q{auto::gdbm};
$conf->add_steps($pkg);
@@ -62,7 +58,6 @@
argv => [ q{--without-gdbm} ],
mode => q{configure},
} );
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
@@ -107,7 +102,6 @@
argv => [ q{--without-gdbm} ],
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/gettext-01.t
==============================================================================
--- branches/configtests/t/steps/auto/gettext-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/gettext-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,15 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 30;
+use Test::More tests => 32;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::gettext');
-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,7 +25,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::gettext};
@@ -160,21 +159,29 @@
$verbose = undef;
$conf->data->set( ccflags => q{} );
-ok(auto::gettext::_handle_gettext($conf, $verbose),
+$conf->data->set( libs => q{} );
+my $libs = q{foo bar baz};
+ok(auto::gettext::_handle_gettext($conf, $verbose, $libs),
"_handle_gettext() returned true value");
like($conf->data->get( 'ccflags' ), qr/-DHAS_GETTEXT/,
"HAS_GETTEXT was added to 'ccflags'");
+like($conf->data->get( 'libs' ), qr/$libs/,
+ "Values added to 'libs' as expected");
+$conf->data->set( ccflags => q{} );
+$conf->data->set( libs => q{} );
{
my ($stdout, $rv);
$verbose = 1;
capture(
- sub { $rv = auto::gettext::_handle_gettext($conf, $verbose); },
+ sub { $rv = auto::gettext::_handle_gettext($conf, $verbose, $libs); },
\$stdout,
);
ok($rv, "_handle_gettext() returned true value");
like($conf->data->get( 'ccflags' ), qr/-DHAS_GETTEXT/,
"HAS_GETTEXT was added to 'ccflags'");
+ like($conf->data->get( 'libs' ), qr/$libs/,
+ "Values added to 'libs' as expected");
like($stdout,
qr/ccflags:\s.*-DHAS_GETTEXT/,
"Got expected verbose output"
Modified: branches/configtests/t/steps/auto/gmp-01.t
==============================================================================
--- branches/configtests/t/steps/auto/gmp-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/gmp-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,19 +5,16 @@
use strict;
use warnings;
-use Test::More tests => 31;
+use Test::More tests => 26;
use Carp;
use Cwd;
use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::gmp');
-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 );
@@ -35,9 +32,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::gmp};
Modified: branches/configtests/t/steps/auto/headers-01.t
==============================================================================
--- branches/configtests/t/steps/auto/headers-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/headers-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,14 @@
use strict;
use warnings;
-use Test::More tests => 30;
+use Test::More qw(no_plan); # tests => 30;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::headers');
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 |;
@@ -28,11 +26,10 @@
}
);
-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::headers};
$conf->add_steps($pkg);
@@ -54,8 +51,6 @@
}
);
-rerun_defaults_for_testing($conf, $args );
-
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
@@ -79,8 +74,6 @@
}
);
-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/inline-01.t
==============================================================================
--- branches/configtests/t/steps/auto/inline-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/inline-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 37;
+use Test::More tests => 32;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::inline');
-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 );
@@ -28,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{auto::inline};
Modified: branches/configtests/t/steps/auto/isreg-01.t
==============================================================================
--- branches/configtests/t/steps/auto/isreg-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/isreg-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 23;
+use Test::More tests => 18;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::isreg');
-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 |;
@@ -26,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::isreg};
Modified: branches/configtests/t/steps/auto/jit-01.t
==============================================================================
--- branches/configtests/t/steps/auto/jit-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/jit-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,23 +5,20 @@
use strict;
use warnings;
-use Test::More tests => 9;
+use Test::More tests => 4;
use Carp;
use Cwd;
use File::Path qw( mkpath );
use File::Temp qw( tempdir );
use File::Spec;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::jit');
-use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use IO::CaptureOutput qw( capture );
+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 );
my ($args, $step_list_ref) = process_options( {
@@ -29,12 +26,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 );
-
my $pkg = q{auto::jit};
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
Modified: branches/configtests/t/steps/auto/memalign-01.t
==============================================================================
--- branches/configtests/t/steps/auto/memalign-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/memalign-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 69;
+use Test::More tests => 58;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::memalign');
-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 |;
@@ -28,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::memalign};
$conf->add_steps($pkg);
@@ -58,7 +54,7 @@
mode => q{configure},
}
);
-rerun_defaults_for_testing($conf, $args );
+
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
@@ -162,7 +158,7 @@
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/neg_0-01.t
==============================================================================
--- branches/configtests/t/steps/auto/neg_0-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/neg_0-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,20 +5,13 @@
use strict;
use warnings;
-
-use Test::More tests => 31;
+use Test::More tests => 23;
use Carp;
-
use lib qw( lib t/configure/testlib );
-
-use_ok('config::init::defaults');
use_ok('config::auto::neg_0');
-
-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 'capture';
@@ -32,9 +25,9 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
-test_step_thru_runstep( $conf, 'init::defaults', $args );
my $pkg = 'auto::neg_0';
$conf->add_steps($pkg);
@@ -87,7 +80,7 @@
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);
Modified: branches/configtests/t/steps/auto/opengl-01.t
==============================================================================
--- branches/configtests/t/steps/auto/opengl-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/opengl-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 43;
+use Test::More tests => 32;
use Carp;
use lib qw( lib );
-use_ok('config::init::defaults');
use_ok('config::auto::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
- rerun_defaults_for_testing
test_step_constructor_and_description
);
use IO::CaptureOutput qw| capture |;
@@ -28,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::opengl};
$conf->add_steps($pkg);
@@ -54,7 +50,6 @@
mode => q{configure},
}
);
-rerun_defaults_for_testing($conf, $args );
$conf->add_steps($pkg);
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
@@ -131,7 +126,6 @@
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/pcre-01.t
==============================================================================
--- branches/configtests/t/steps/auto/pcre-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/pcre-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 34;
+use Test::More tests => 23;
use Carp;
use lib qw( lib );
-use_ok('config::init::defaults');
use_ok('config::auto::pcre');
-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 |;
@@ -28,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::pcre};
$conf->add_steps($pkg);
@@ -52,7 +48,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);
@@ -122,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);
Modified: branches/configtests/t/steps/auto/readline-01.t
==============================================================================
--- branches/configtests/t/steps/auto/readline-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/readline-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,18 +5,16 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 9;
use Carp;
use Cwd;
use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib );
-use_ok('config::init::defaults');
use_ok('config::auto::readline');
-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 |;
@@ -30,9 +28,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::readline};
Modified: branches/configtests/t/steps/auto/readline-02.t
==============================================================================
--- branches/configtests/t/steps/auto/readline-02.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/readline-02.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -10,10 +10,9 @@
use Cwd;
use lib qw( lib );
use_ok('config::auto::readline');
-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,7 +24,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::readline};
Modified: branches/configtests/t/steps/auto/signal-01.t
==============================================================================
--- branches/configtests/t/steps/auto/signal-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/signal-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,18 +5,15 @@
use strict;
use warnings;
-use Test::More tests => 35;
+use Test::More tests => 27;
use Carp;
use Cwd;
use File::Temp qw(tempdir);
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::signal');
-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 |;
@@ -28,12 +25,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 );
-
my $pkg = q{auto::signal};
$conf->add_steps($pkg);
@@ -83,7 +79,7 @@
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);
Modified: branches/configtests/t/steps/auto/sizes-01.t
==============================================================================
--- branches/configtests/t/steps/auto/sizes-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/sizes-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -5,16 +5,13 @@
use strict;
use warnings;
-use Test::More tests => 58;
+use Test::More tests => 53;
use Carp;
use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
use_ok('config::auto::sizes');
-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 |;
@@ -29,12 +26,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::sizes};
$conf->add_steps($pkg);
Modified: branches/configtests/t/steps/auto/socklen_t-01.t
==============================================================================
--- branches/configtests/t/steps/auto/socklen_t-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/socklen_t-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -9,11 +9,9 @@
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::socklen_t');
-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,7 +25,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::socklen_t};
Modified: branches/configtests/t/steps/auto/va_ptr-01.t
==============================================================================
--- branches/configtests/t/steps/auto/va_ptr-01.t Fri Nov 6 02:49:34 2009 (r42296)
+++ branches/configtests/t/steps/auto/va_ptr-01.t Fri Nov 6 02:57:57 2009 (r42297)
@@ -9,10 +9,9 @@
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::auto::va_ptr');
-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
);
@@ -23,7 +22,8 @@
}
);
-my $conf = Parrot::Configure->new;
+my $conf = Parrot::Configure::Step::Test->new;
+$conf->include_config_results( $args );
my $pkg = q{auto::va_ptr};
$conf->add_steps($pkg);
More information about the parrot-commits
mailing list