[svn:parrot] r41544 - in trunk: . config/auto config/auto/funcptr lib/Parrot/Configure/Step t/steps/auto
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Tue Sep 29 01:49:47 UTC 2009
Author: jkeenan
Date: Tue Sep 29 01:49:46 2009
New Revision: 41544
URL: https://trac.parrot.org/parrot/changeset/41544
Log:
Remove config step auto::funcptr, associated probe and test file. Per https://trac.parrot.org/parrot/attachment/ticket/1058.
Deleted:
trunk/config/auto/funcptr/
trunk/config/auto/funcptr.pm
trunk/t/steps/auto/funcptr-01.t
Modified:
trunk/Configure.pl
trunk/MANIFEST
trunk/lib/Parrot/Configure/Step/List.pm
Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl Mon Sep 28 23:42:52 2009 (r41543)
+++ trunk/Configure.pl Tue Sep 29 01:49:46 2009 (r41544)
@@ -623,7 +623,6 @@
auto::jit
auto::frames
auto::cpu
- auto::funcptr
auto::cgoto
auto::inline
auto::gc
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Mon Sep 28 23:42:52 2009 (r41543)
+++ trunk/MANIFEST Tue Sep 29 01:49:46 2009 (r41544)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Sep 19 08:24:23 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Sep 29 01:34:44 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -236,8 +236,6 @@
config/auto/frames/test_exec_cygwin_c.in []
config/auto/frames/test_exec_linux_c.in []
config/auto/frames/test_exec_openbsd_c.in []
-config/auto/funcptr.pm []
-config/auto/funcptr/test_c.in []
config/auto/gc.pm []
config/auto/gc/test_c.in []
config/auto/gcc.pm []
@@ -1922,7 +1920,6 @@
t/steps/auto/env-01.t [test]
t/steps/auto/format-01.t [test]
t/steps/auto/frames-01.t [test]
-t/steps/auto/funcptr-01.t [test]
t/steps/auto/gc-01.t [test]
t/steps/auto/gcc-01.t [test]
t/steps/auto/gdbm-01.t [test]
Deleted: trunk/config/auto/funcptr.pm
==============================================================================
--- trunk/config/auto/funcptr.pm Tue Sep 29 01:49:46 2009 (r41543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,80 +0,0 @@
-# Copyright (C) 2001-2003, Parrot Foundation.
-# $Id$
-
-=head1 NAME
-
-config/auto/funcptr.pm - Function Pointer Casts
-
-=head1 DESCRIPTION
-
-Verifies that the compiler supports function pointer casts.
-
-=cut
-
-package auto::funcptr;
-
-use strict;
-use warnings;
-
-use base qw(Parrot::Configure::Step);
-
-use Parrot::Configure::Utils ':auto';
-
-
-sub _init {
- my $self = shift;
- my %data;
- $data{description} = q{Does compiler support function pointer casts};
- $data{result} = q{};
- return \%data;
-}
-
-sub runstep {
- my ( $self, $conf ) = @_;
-
- my $jitcapable = $conf->data->get('jitcapable');
-
- if ($jitcapable) {
- $conf->cc_gen('config/auto/funcptr/test_c.in');
- eval { $conf->cc_build(); };
-
- if ( $@ || $conf->cc_run() !~ /OK/ ) {
- _cast_void_pointers_msg();
- exit(-1);
- }
- $conf->cc_clean();
- $self->_set_positive_result($conf);
- }
-
- return 1;
-}
-
-sub _cast_void_pointers_msg {
- print <<"END";
-Although it is not required by the ANSI C standard,
-Parrot requires the ability to cast from void pointers to function
-pointers for its JIT support.
-
-Your compiler does not appear to support this behavior with the
-flags you have specified. You must adjust your settings in order
-to use the JIT code.
-
-If you wish to continue without JIT support, please re-run this script
-With the '--jitcapable=0' argument.
-END
-}
-
-sub _set_positive_result {
- my ($self, $conf) = @_;
- print " (yes) " if $conf->options->get('verbose');
- $self->set_result('yes');
-}
-
-1;
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Modified: trunk/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step/List.pm Mon Sep 28 23:42:52 2009 (r41543)
+++ trunk/lib/Parrot/Configure/Step/List.pm Tue Sep 29 01:49:46 2009 (r41544)
@@ -42,7 +42,6 @@
auto::jit
auto::frames
auto::cpu
- auto::funcptr
auto::cgoto
auto::inline
auto::gc
Deleted: trunk/t/steps/auto/funcptr-01.t
==============================================================================
--- trunk/t/steps/auto/funcptr-01.t Tue Sep 29 01:49:46 2009 (r41543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,134 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto/funcptr-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 28;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::funcptr');
-use Parrot::BuildUtil;
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########### --jitcapable=0 ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ q{--jitcapable=0} ],
- 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::funcptr};
-
-$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 defined value" );
-
-$conf->replenish($serialized);
-
-########### _cast_void_pointers_msg() ###########
-
-($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 $stdout;
- my $ret = capture(
- sub { auto::funcptr::_cast_void_pointers_msg(); },
- \$stdout,
- );
- like($stdout, qr/Although it is not required/s,
- "Got expected advisory message");
-}
-
-########### _set_positive_result() ###########
-
-{
- my $stdout;
- my $ret = capture(
- sub { auto::funcptr::_set_positive_result($step, $conf); },
- \$stdout,
- );
- is($step->result, q{yes}, "Got expected result");
- ok(! $stdout, "Nothing printed to STDOUT, as expected");
-}
-
-$conf->replenish($serialized);
-
-########### --verbose; _set_positive_result() ###########
-
-($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);
-{
- my $stdout;
- my $ret = capture(
- sub { auto::funcptr::_set_positive_result($step, $conf); },
- \$stdout,
- );
- is($step->result, q{yes}, "Got expected result");
- like($stdout, qr/yes/, "Got expected verbose output");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto/funcptr-01.t - test auto::funcptr
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto/funcptr-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test aspects of auto::funcptr.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::funcptr, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
More information about the parrot-commits
mailing list