Author: coke
Date: Fri Nov 28 14:41:42 2008
New Revision: 33320
Removed:
trunk/config/init/miniparrot.pm
trunk/t/steps/init_miniparrot-01.t
trunk/tools/dev/rebuild_miniparrot.pl
Modified:
trunk/Configure.pl
trunk/MANIFEST
trunk/config/auto/alignptrs.pm
trunk/config/auto/arch.pm
trunk/config/auto/cgoto.pm
trunk/config/auto/cpu.pm
trunk/config/auto/gcc.pm
trunk/config/auto/headers.pm
trunk/config/auto/jit.pm
trunk/config/auto/memalign.pm
trunk/config/auto/signal.pm
trunk/config/auto/sizes.pm
trunk/config/gen/config_h/feature_h.in
trunk/config/gen/makefiles/root.in
trunk/config/gen/platform.pm
trunk/docs/ROADMAP.pod
trunk/include/parrot/io.h
trunk/lib/Parrot/Configure/Options/Conf.pm
trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
trunk/lib/Parrot/Configure/Step/List.pm
trunk/lib/Parrot/Docs/Section/Tools.pm
trunk/lib/Parrot/OpsFile.pm
trunk/t/configure/034-step.t
trunk/t/configure/testlib/adefectivefoobar
trunk/t/configure/testlib/bdefectivefoobar
trunk/t/configure/testlib/cdefectivefoobar
trunk/t/configure/testlib/ddefectivefoobar
trunk/t/configure/testlib/verbosefoobar
trunk/t/steps/auto_alignptrs-01.t
trunk/t/steps/auto_cgoto-01.t
trunk/t/steps/auto_cpu-01.t
trunk/t/steps/auto_gcc-01.t
trunk/t/steps/auto_headers-01.t
trunk/t/steps/auto_jit-01.t
trunk/t/steps/auto_sizes-01.t
trunk/t/steps/gen_platform-01.t
trunk/xconf/samples/testfoobar
trunk/xconf/samples/yourfoobar
Log:
eliminate --miniparrot option to Configure.pl (RT #55386)
It hasn't been possible to build parrot with this option for some time now, and
it's goal (provide an ansi-compatible parrot) is covered by parrot in general.
jkeenan++
Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl (original)
+++ trunk/Configure.pl Fri Nov 28 14:41:42 2008
@@ -379,10 +379,6 @@
Use this option if you want imcc's parser and lexer files to be generated.
Needs a working parser and lexer.
-=item C<--miniparrot>
-
-Build parrot assuming only pure ANSI C is available.
-
=back
=head1 CONFIGURATION-FILE INTERFACE
@@ -570,7 +566,6 @@
init::manifest nomanicheck
init::defaults
init::install
- init::miniparrot
init::hints verbose-step
init::headers
inter::progs
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Fri Nov 28 14:41:42 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Fri Nov 28 14:44:53 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Nov 28 22:25:51 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -431,7 +431,6 @@
config/init/hints/vms.pm []
config/init/install.pm []
config/init/manifest.pm []
-config/init/miniparrot.pm []
config/init/optimize.pm []
config/inter/charset.pm []
config/inter/encoding.pm []
@@ -3659,7 +3658,6 @@
t/steps/init_hints-01.t []
t/steps/init_install-01.t []
t/steps/init_manifest-01.t []
-t/steps/init_miniparrot-01.t []
t/steps/init_optimize-01.t []
t/steps/inter_charset-01.t []
t/steps/inter_encoding-01.t []
@@ -3769,7 +3767,6 @@
tools/dev/pbc_header.pl [devel]
tools/dev/pbc_to_exe_gen.pl [devel]
tools/dev/pmctree.pl [devel]
-tools/dev/rebuild_miniparrot.pl [devel]
tools/dev/reconfigure.pl [devel]
tools/dev/search-ops.pl [devel]
tools/dev/src-t.sh [devel]
Modified: trunk/config/auto/alignptrs.pm
==============================================================================
--- trunk/config/auto/alignptrs.pm (original)
+++ trunk/config/auto/alignptrs.pm Fri Nov 28 14:41:42 2008
@@ -31,11 +31,6 @@
sub runstep {
my ( $self, $conf ) = ( shift, shift );
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
my $result_str = '';
my $align;
if ( defined( $conf->data->get('ptr_alignment') ) ) {
Modified: trunk/config/auto/arch.pm
==============================================================================
--- trunk/config/auto/arch.pm (original)
+++ trunk/config/auto/arch.pm Fri Nov 28 14:41:42 2008
@@ -32,11 +32,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
my $verbose = $conf->options->get('verbose');
$verbose and print "\n";
Modified: trunk/config/auto/cgoto.pm
==============================================================================
--- trunk/config/auto/cgoto.pm (original)
+++ trunk/config/auto/cgoto.pm Fri Nov 28 14:41:42 2008
@@ -31,11 +31,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
my $test = _probe_for_cgoto( $conf );
$self->_evaluate_cgoto($conf, $test);
Modified: trunk/config/auto/cpu.pm
==============================================================================
--- trunk/config/auto/cpu.pm (original)
+++ trunk/config/auto/cpu.pm Fri Nov 28 14:41:42 2008
@@ -33,11 +33,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
my $verbose = $conf->options->get('verbose');
$conf->data->add( ' ', TEMP_atomic_o => '' ); # assure a default
Modified: trunk/config/auto/gcc.pm
==============================================================================
--- trunk/config/auto/gcc.pm (original)
+++ trunk/config/auto/gcc.pm Fri Nov 28 14:41:42 2008
@@ -91,23 +91,13 @@
$conf->data->set( sym_export => '__attribute__ ((visibility("default")))' )
if $gccversion >= 4.0;
- if ( defined $conf->options->get('miniparrot') ) {
- # make the compiler act as ANSIish as possible, and avoid enabling
- # support for GCC-specific features.
- $conf->data->set(
- ccwarn => "-ansi -pedantic",
- gccversion => undef
- );
- }
- else {
- $conf->data->set(
- ccwarn => "$ccwarn",
- gccversion => $gccversion,
- HAS_aligned_funcptr => 1
- );
- $conf->data->set( HAS_aligned_funcptr => 0 )
- if $conf->data->get_p5('OSNAME') eq 'hpux';
- }
+ $conf->data->set(
+ ccwarn => "$ccwarn",
+ gccversion => $gccversion,
+ HAS_aligned_funcptr => 1
+ );
+ $conf->data->set( HAS_aligned_funcptr => 0 )
+ if $conf->data->get_p5('OSNAME') eq 'hpux';
return 1;
}
Modified: trunk/config/auto/headers.pm
==============================================================================
--- trunk/config/auto/headers.pm (original)
+++ trunk/config/auto/headers.pm Fri Nov 28 14:41:42 2008
@@ -30,11 +30,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
_set_from_Config($conf);
my @extra_headers = _list_extra_headers($conf);
Modified: trunk/config/auto/jit.pm
==============================================================================
--- trunk/config/auto/jit.pm (original)
+++ trunk/config/auto/jit.pm Fri Nov 28 14:41:42 2008
@@ -48,11 +48,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
-
my $verbose = $conf->options->get('verbose');
$verbose and print "\n";
Modified: trunk/config/auto/memalign.pm
==============================================================================
--- trunk/config/auto/memalign.pm (original)
+++ trunk/config/auto/memalign.pm Fri Nov 28 14:41:42 2008
@@ -32,12 +32,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( $conf->options->get('miniparrot') ) {
- $conf->data->set( memalign => '' );
- $self->set_result('skipped');
- return 1;
- }
-
if ( defined $conf->data->get('memalign') ) {
# already set; leave it alone
Modified: trunk/config/auto/signal.pm
==============================================================================
--- trunk/config/auto/signal.pm (original)
+++ trunk/config/auto/signal.pm Fri Nov 28 14:41:42 2008
@@ -38,10 +38,6 @@
has_sigaction => undef,
has_setitimer => undef
);
- if ( defined $conf->options->get('miniparrot') ) {
- $self->set_result('skipped');
- return 1;
- }
my $verbose = $conf->options->get('verbose');
Modified: trunk/config/auto/sizes.pm
==============================================================================
--- trunk/config/auto/sizes.pm (original)
+++ trunk/config/auto/sizes.pm Fri Nov 28 14:41:42 2008
@@ -32,31 +32,6 @@
sub runstep {
my ( $self, $conf ) = @_;
- if ( defined $conf->options->get('miniparrot') ) {
- $conf->data->set(
- doublesize => 8,
- numvalsize => 8,
- nvsize => 8,
- floatsize => 4,
- opcode_t_size => 4,
- ptrsize => 4,
- intvalsize => 4,
- intsize => 4,
- longsize => 4,
- shortsize => 2,
- hugeintval => 'long',
- hugeintvalsize => 4,
- hugefloatval => 'double',
- hugefloatvalsize => 8,
- int2_t => 'int',
- int4_t => 'int',
- float4_t => 'double',
- float8_t => 'double',
- );
- $self->set_result('using miniparrot defaults');
- return 1;
- }
-
$conf->cc_gen('config/auto/sizes/test_c.in');
$conf->cc_build();
my %results = eval $conf->cc_run();
Modified: trunk/config/gen/config_h/feature_h.in
==============================================================================
--- trunk/config/gen/config_h/feature_h.in (original)
+++ trunk/config/gen/config_h/feature_h.in Fri Nov 28 14:41:42 2008
@@ -10,16 +10,6 @@
print OUT <<'END_PRINT';
-/* from config/init/miniparrot */
-END_PRINT
-if (@miniparrot@) {
- print OUT <<'END_PRINT';
-#define MINIPARROT 1
-END_PRINT
-}
-
-print OUT <<'END_PRINT';
-
/* from config/auto/memalign */
END_PRINT
if (@memalign@ eq 'posix_memalign') {
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Fri Nov 28 14:41:42 2008
@@ -812,8 +812,6 @@
$(CHMOD) 0755 $(PERL6)
$(PERL6) -e"say 'Hello, world.'"
-
-# TODO build the real miniparrot
$(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
$(LINK) @[EMAIL PROTECTED]@ $(SRC_DIR)/main$(O)
$(SRC_DIR)/null_config$(O) \
Modified: trunk/config/gen/platform.pm
==============================================================================
--- trunk/config/gen/platform.pm (original)
+++ trunk/config/gen/platform.pm Fri Nov 28 14:41:42 2008
@@ -67,7 +67,6 @@
my ($conf, $verbose) = @_;
my $platform = lc ( $conf->data->get_p5('OSNAME') );
- $platform = "ansi" if $conf->options->get('miniparrot');
$platform = "win32" if $platform =~ /^msys/;
$platform = "win32" if $platform =~ /^mingw/;
$platform =~ s/^ms//;
Modified: trunk/docs/ROADMAP.pod
==============================================================================
--- trunk/docs/ROADMAP.pod (original)
+++ trunk/docs/ROADMAP.pod Fri Nov 28 14:41:42 2008
@@ -280,10 +280,6 @@
=item *
-building miniparrot is broken
-
-=item *
-
GC issue (copying collector) - immobile strings/buffers get freed during GC.
=item *
Modified: trunk/include/parrot/io.h
==============================================================================
--- trunk/include/parrot/io.h (original)
+++ trunk/include/parrot/io.h Fri Nov 28 14:41:42 2008
@@ -22,17 +22,13 @@
#include <stdio.h>
/* which OS are we on? (this should be moved into Configure-land) */
-#ifdef MINIPARROT
-# define PIO_OS_STDIO
+#ifdef _WIN32
+# define PIO_OS_WIN32
#else
-# ifdef _WIN32
-# define PIO_OS_WIN32
+# ifdef PARROT_HAS_HEADER_UNISTD
+# define PIO_OS_UNIX
# else
-# ifdef PARROT_HAS_HEADER_UNISTD
-# define PIO_OS_UNIX
-# else
-# define PIO_OS_STDIO
-# endif
+# define PIO_OS_STDIO
# endif
#endif
Modified: trunk/lib/Parrot/Configure/Options/Conf.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf.pm (original)
+++ trunk/lib/Parrot/Configure/Options/Conf.pm Fri Nov 28 14:41:42 2008
@@ -126,7 +126,6 @@
--maintainer Create imcc's parser and lexer files. Needs a working
parser and lexer.
- --miniparrot Build parrot assuming only pure ANSI C is available
Install Options:
Modified: trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf/Shared.pm (original)
+++ trunk/lib/Parrot/Configure/Options/Conf/Shared.pm Fri Nov 28 14:41:42 2008
@@ -50,7 +50,6 @@
make
maintainer
mandir
- miniparrot
nomanicheck
oldincludedir
opcode
Modified: trunk/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step/List.pm (original)
+++ trunk/lib/Parrot/Configure/Step/List.pm Fri Nov 28 14:41:42 2008
@@ -11,7 +11,6 @@
init::manifest
init::defaults
init::install
- init::miniparrot
init::hints
init::headers
inter::progs
Modified: trunk/lib/Parrot/Docs/Section/Tools.pm
==============================================================================
--- trunk/lib/Parrot/Docs/Section/Tools.pm (original)
+++ trunk/lib/Parrot/Docs/Section/Tools.pm Fri Nov 28 14:41:42 2008
@@ -80,7 +80,6 @@
$self->new_item( '', 'tools/build/pmc2c.pl' ),
$self->new_item( '', 'tools/dev/install_files.pl' ),
$self->new_item( '', 'tools/dev/mk_manifest_and_skip.pl' ),
- $self->new_item( '', 'tools/dev/rebuild_miniparrot.pl' ),
$self->new_item( '', 'tools/dev/symlink.pl' ),
),
$self->new_group( 'Testing', '', $self->new_item( '',
'tools/dev/mk_native_pbc' ), ),
@@ -102,7 +101,6 @@
'Possibly obsolete',
'',
$self->new_item( '', 'tools/dev/gen_charset_tables.pl' ),
- $self->new_item( '', 'tools/dev/rebuild_miniparrot.pl' ),
),
);
}
Modified: trunk/lib/Parrot/OpsFile.pm
==============================================================================
--- trunk/lib/Parrot/OpsFile.pm (original)
+++ trunk/lib/Parrot/OpsFile.pm Fri Nov 28 14:41:42 2008
@@ -81,7 +81,7 @@
=item 1 class
The classification of ops is intended to facilitate the selection of
-suitable ops for a Parrot safe mode, or for inclusion in miniparrot.
+suitable ops for a Parrot safe mode.
=item 2 behavior
Modified: trunk/t/configure/034-step.t
==============================================================================
--- trunk/t/configure/034-step.t (original)
+++ trunk/t/configure/034-step.t Fri Nov 28 14:41:42 2008
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 15;
use Carp;
use Cwd;
use File::Temp 0.13 qw/ tempdir /;
@@ -85,13 +85,14 @@
print $IN q{#perl\nuse strict;\n$something = 'something';\n};
print $IN <<'END_DUMMY';
#perl
-if (@miniparrot@) { sprint "Hello world\n"; }
+if (@verbose@) { sprint "Hello world\n"; }
END_DUMMY
close $IN or croak "Unable to close temp file";
my ($stdout, $stderr);
capture ( sub { eval { $conf->genfile( $dummy => 'CFLAGS', feature_file =>
1, ) } },
\$stdout, \$stderr );
ok( $stderr, "Error message caught" );
+ like( $stderr, qr/sprint/, "Error message had expected content" );
ok( $@, "Bad Perl code caught by genfile()" );
unlink $dummy or croak "Unable to delete file after testing";
Modified: trunk/t/configure/testlib/adefectivefoobar
==============================================================================
--- trunk/t/configure/testlib/adefectivefoobar (original)
+++ trunk/t/configure/testlib/adefectivefoobar Fri Nov 28 14:41:42 2008
@@ -7,7 +7,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step
init::headers
inter::progs
Modified: trunk/t/configure/testlib/bdefectivefoobar
==============================================================================
--- trunk/t/configure/testlib/bdefectivefoobar (original)
+++ trunk/t/configure/testlib/bdefectivefoobar Fri Nov 28 14:41:42 2008
@@ -17,7 +17,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step
init::headers
inter::progs
Modified: trunk/t/configure/testlib/cdefectivefoobar
==============================================================================
--- trunk/t/configure/testlib/cdefectivefoobar (original)
+++ trunk/t/configure/testlib/cdefectivefoobar Fri Nov 28 14:41:42 2008
@@ -18,7 +18,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step
init::headers
inter::progs
Modified: trunk/t/configure/testlib/ddefectivefoobar
==============================================================================
--- trunk/t/configure/testlib/ddefectivefoobar (original)
+++ trunk/t/configure/testlib/ddefectivefoobar Fri Nov 28 14:41:42 2008
@@ -9,7 +9,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step fatal-step foobar
init::headers
inter::progs
Modified: trunk/t/configure/testlib/verbosefoobar
==============================================================================
--- trunk/t/configure/testlib/verbosefoobar (original)
+++ trunk/t/configure/testlib/verbosefoobar Fri Nov 28 14:41:42 2008
@@ -11,7 +11,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints
init::headers
inter::progs
Modified: trunk/t/steps/auto_alignptrs-01.t
==============================================================================
--- trunk/t/steps/auto_alignptrs-01.t (original)
+++ trunk/t/steps/auto_alignptrs-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_cgoto-01.t
==============================================================================
--- trunk/t/steps/auto_cgoto-01.t (original)
+++ trunk/t/steps/auto_cgoto-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_cpu-01.t
==============================================================================
--- trunk/t/steps/auto_cpu-01.t (original)
+++ trunk/t/steps/auto_cpu-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_gcc-01.t
==============================================================================
--- trunk/t/steps/auto_gcc-01.t (original)
+++ trunk/t/steps/auto_gcc-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_headers-01.t
==============================================================================
--- trunk/t/steps/auto_headers-01.t (original)
+++ trunk/t/steps/auto_headers-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_jit-01.t
==============================================================================
--- trunk/t/steps/auto_jit-01.t (original)
+++ trunk/t/steps/auto_jit-01.t Fri Nov 28 14:41:42 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: trunk/t/steps/auto_sizes-01.t
==============================================================================
--- trunk/t/steps/auto_sizes-01.t (original)
+++ trunk/t/steps/auto_sizes-01.t Fri Nov 28 14:41:42 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 = (
Modified: trunk/t/steps/gen_platform-01.t
==============================================================================
--- trunk/t/steps/gen_platform-01.t (original)
+++ trunk/t/steps/gen_platform-01.t Fri Nov 28 14:41:42 2008
@@ -1,5 +1,5 @@
#! perl
-# Copyright (C) 2007, The Perl Foundation.
+# Copyright (C) 2007-2008, The Perl Foundation.
# $Id$
# gen_platform-01.t
Modified: trunk/xconf/samples/testfoobar
==============================================================================
--- trunk/xconf/samples/testfoobar (original)
+++ trunk/xconf/samples/testfoobar Fri Nov 28 14:41:42 2008
@@ -9,7 +9,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step fatal-step
init::headers
inter::progs
Modified: trunk/xconf/samples/yourfoobar
==============================================================================
--- trunk/xconf/samples/yourfoobar (original)
+++ trunk/xconf/samples/yourfoobar Fri Nov 28 14:41:42 2008
@@ -17,7 +17,6 @@
init::manifest nomanicheck
init::defaults
init::install
-init::miniparrot
init::hints verbose-step
init::headers
inter::progs
