You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2001/10/20 03:00:43 UTC
cvs commit: httpd-test/perl-framework/t/modules include.t
dougm 01/10/19 18:00:43
Modified: perl-framework/t/modules include.t
Log:
fix for win32: need to deal with \r's
Revision Changes Path
1.10 +4 -3 httpd-test/perl-framework/t/modules/include.t
Index: include.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/modules/include.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- include.t 2001/09/18 15:41:03 1.9
+++ include.t 2001/10/20 01:00:43 1.10
@@ -71,11 +71,12 @@
my $url = "$dir$doc";
$actual = GET_BODY $url;
- ## super chomp - all leading and trailing \n
- $actual =~ s/^\n*//;
- $actual =~ s/\n*$//;
+ ## super chomp - all leading and trailing \n (and \r for win32)
+ $actual =~ s/^[\n\r]*//;
+ $actual =~ s/[\n\r]*$//;
## and all the rest change to spaces
$actual =~ s/\n/ /g;
+ $actual =~ s/\r//g; #rip out all remaining \r's
my $ok = $actual eq $expected;