stas 2004/01/29 16:24:44
Modified: t/apache read.t t/api sendfile.t t/compat send_fd.t Log: make the tests portable (wrt where t/TEST is running from) Revision Changes Path 1.6 +3 -1 modperl-2.0/t/apache/read.t Index: read.t =================================================================== RCS file: /home/cvs/modperl-2.0/t/apache/read.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -u -r1.5 -r1.6 --- read.t 18 Apr 2003 06:18:55 -0000 1.5 +++ read.t 30 Jan 2004 00:24:44 -0000 1.6 @@ -4,6 +4,8 @@ use Apache::Test; use Apache::TestRequest; +use File::Spec::Functions qw(catfile); + plan tests => 1; #force test to go over http, since this doesn't work with t/TEST -ssl @@ -13,7 +15,7 @@ my $socket = Apache::TestRequest::vhost_socket('default'); -my $file = '../Makefile'; +my $file = catfile Apache::Test::vars('serverroot'), "..", 'Makefile'; open(my $fh, $file) or die "open $file: $!"; 1.6 +4 -1 modperl-2.0/t/api/sendfile.t Index: sendfile.t =================================================================== RCS file: /home/cvs/modperl-2.0/t/api/sendfile.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -u -r1.5 -r1.6 --- sendfile.t 18 Apr 2003 06:18:55 -0000 1.5 +++ sendfile.t 30 Jan 2004 00:24:44 -0000 1.6 @@ -4,6 +4,8 @@ use Apache::Test; use Apache::TestRequest; +use File::Spec::Functions qw(catfile); + plan tests => 3; my $config = Apache::Test::config(); @@ -14,7 +16,8 @@ ok $data; -my $module = 'response/TestAPI/sendfile.pm'; +my $module = catfile Apache::Test::vars('serverroot'), + 'response/TestAPI/sendfile.pm'; ok length($data) == -s $module; 1.3 +4 -1 modperl-2.0/t/compat/send_fd.t Index: send_fd.t =================================================================== RCS file: /home/cvs/modperl-2.0/t/compat/send_fd.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- send_fd.t 18 Apr 2003 06:18:55 -0000 1.2 +++ send_fd.t 30 Jan 2004 00:24:44 -0000 1.3 @@ -4,6 +4,8 @@ use Apache::Test; use Apache::TestRequest; +use File::Spec::Functions qw(catfile); + plan tests => 3; my $config = Apache::Test::config(); @@ -14,7 +16,8 @@ ok $data; -my $module = 'response/TestCompat/send_fd.pm'; +my $module = catfile Apache::Test::vars('serverroot'), + 'response/TestCompat/send_fd.pm'; ok length($data) == -s $module;