dougm 01/04/04 10:27:17
Modified: t TEST.PL
Apache-Test/lib/Apache TestRun.pm
Log:
on second thought, have Apache::TestRun take care of fixing up $^X
Revision Changes Path
1.4 +0 -3 modperl-2.0/t/TEST.PL
Index: TEST.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/t/TEST.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TEST.PL 2001/04/04 17:24:36 1.3
+++ TEST.PL 2001/04/04 17:27:16 1.4
@@ -2,12 +2,9 @@
use strict;
use warnings FATAL => 'all';
-use Config;
use lib map { "$_/Apache-Test/lib" } qw(. ..);
use Apache::TestRunPerl ();
-
-$^X = $Config{perlpath} if $^X eq 'perl';
Apache::TestRunPerl->new->run(@ARGV);
1.4 +6 -0 modperl-2.0/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestRun.pm 2001/04/03 17:24:46 1.3
+++ TestRun.pm 2001/04/04 17:27:16 1.4
@@ -9,6 +9,7 @@
use File::Spec::Functions qw(catfile);
use Getopt::Long qw(GetOptions);
+use Config;
my @std_run = qw(start-httpd run-tests stop-httpd);
my @others = qw(verbose configure clean help ping);
@@ -250,6 +251,11 @@
verbose => $self->{opts}->{verbose},
tests => $self->{tests},
};
+
+ #make sure we use an absolute path to perl
+ #else Test::Harness uses the perl in our PATH
+ #which might not be the one we want
+ $^X = $Config{perlpath} if $^X eq 'perl';
if (grep { $self->{opts}->{$_} } @request_opts) {
run_request($self->{test_config}, $self->{opts});
