diff options
| author | Steve Peters <steve@fisharerojo.org> | 2005-06-15 06:30:41 -0500 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-06-15 16:24:05 +0000 |
| commit | ab019eaa775fdcae8aaf709315c7ba85a788ee6c (patch) | |
| tree | 475423bc731cde054c3ca96189d4c48b893ac0cf | |
| parent | 4d56230864c7d2d21814f925d64f6987011e1924 (diff) | |
| download | perl-ab019eaa775fdcae8aaf709315c7ba85a788ee6c.tar.gz | |
Re: [PATCH] make -f invalid when USE_SITECUSTOMIZE isn't set
Message-ID: <20050615163040.GA14745@mccoy.peters.homeunix.org>
p4raw-id: //depot/perl@24854
| -rw-r--r-- | ext/Devel/DProf/t/DProf.t | 6 | ||||
| -rw-r--r-- | perl.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ext/Devel/DProf/t/DProf.t b/ext/Devel/DProf/t/DProf.t index bdd70b002b..84bc9272e3 100644 --- a/ext/Devel/DProf/t/DProf.t +++ b/ext/Devel/DProf/t/DProf.t @@ -17,6 +17,7 @@ END { } use Benchmark qw( timediff timestr ); +use Config; use Getopt::Std 'getopts'; getopts('vI:p:'); @@ -45,10 +46,11 @@ sub profile { my $test = shift; my @results; local $ENV{PERL5LIB} = $perl5lib; + my $opt_f = $Config{ccflags} =~ /USE_SITECUSTOMIZE/ ? '-f' : ''; my $opt_d = '-d:DProf'; my $t_start = new Benchmark; - open( R, "$perl -f \"$opt_d\" $test |" ) || warn "$0: Can't run. $!\n"; + open( R, "$perl $opt_f \"$opt_d\" $test |" ) || warn "$0: Can't run. $!\n"; @results = <R>; close R or warn "Could not close: $!"; my $t_total = timediff( new Benchmark, $t_start ); @@ -76,7 +78,7 @@ $| = 1; print "1..20\n"; while( @tests ){ $test = shift @tests; - $test =~ s/\.$// if $^O eq 'VMS'; + $test =~ s/\.$// if $^O eq 'VMS'; if( $test =~ /_t$/i ){ print "# $test" . '.' x (20 - length $test); profile $test; @@ -1282,7 +1282,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) register SV *sv; register char *s; const char *cddir = Nullch; +#ifdef USE_SITECUSTOMIZE bool minus_f = FALSE; +#endif PL_fdscript = -1; PL_suidscript = -1; @@ -1376,11 +1378,13 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) sv_catpv(PL_e_script, "\n"); break; +#ifdef USE_SITECUSTOMIZE case 'f': minus_f = TRUE; s++; goto reswitch; +#endif case 'I': /* -I handled both here and in moreswitches() */ forbid_setid("-I"); if (!*++s && (s=argv[1]) != Nullch) { |