From 63c6dcc1775b960c3418c4c23568c59231321ed1 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Wed, 12 Mar 2003 10:52:17 +0000 Subject: Integrate: [ 18946] Integrate from maint-5.8/macperl: [ 18937] Various MacOS portability fixes for tests [ 18938] File::Spec::Unix method should be called on $self [ 18939] lib.pm:_get_dirs() should use $_[0], not $_ [ 18940] Update MacOS for new configpm [ 18941] Update MacOS build Update Makefile for new source files, update test script, add additional symbol for APItest p4raw-link: @18946 on //depot/maint-5.8/perl: 494df11159c23652339c95affadb99da70ef89e6 p4raw-link: @18941 on //depot/maint-5.8/macperl: 9b3df31c299856a4cb17c1b4a9c403df0a69ec28 p4raw-link: @18940 on //depot/maint-5.8/macperl: 5d97ba7550864e5eaacd84839be0d01c212a6d00 p4raw-link: @18939 on //depot/maint-5.8/macperl: be568d45c1392c31a2787cdaf2ab37fb4a91ced1 p4raw-link: @18938 on //depot/maint-5.8/macperl: efc910e725c427d20af16b2fdf1d43228fecfc02 p4raw-link: @18937 on //depot/maint-5.8/macperl: bbcece98349dade0635a793d66ae4e883c9097d6 p4raw-id: //depot/perl@18951 p4raw-integrated: from //depot/maint-5.8/perl@18950 'copy in' ext/POSIX/t/taint.t t/op/stat.t (@17645..) lib/Unicode/Collate/t/index.t lib/Unicode/Collate/t/test.t lib/lib_pm.PL t/op/mkdir.t (@18080..) ext/Filter/t/call.t lib/charnames.t t/op/taint.t t/run/switchI.t (@18458..) lib/File/Spec/Unix.pm (@18466..) t/io/crlf.t (@18638..) ext/Digest/MD5/t/files.t (@18743..) t/op/method.t (@18850..) t/pod/testp2pt.pl (@18890..) t/op/sprintf.t (@18911..) t/op/recurse.t (@18922..) p4raw-branched: from //depot/maint-5.8/perl@18946 'branch in' macos/MacPerlTests.cmd macos/Makefile.mk macos/configpm macos/macperl.sym --- t/io/crlf.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/io') diff --git a/t/io/crlf.t b/t/io/crlf.t index 5f879f2681..084be211fd 100644 --- a/t/io/crlf.t +++ b/t/io/crlf.t @@ -35,7 +35,7 @@ if (find PerlIO::Layer 'perlio') { eval 'use PerlIO::scalar'; skip(q/miniperl cannnot load PerlIO::scalar/) if $@ =~ /dynamic loading not available/; - my $fcontents = join "", map {"$_\r\n"} "a".."zzz"; + my $fcontents = join "", map {"$_\015\012"} "a".."zzz"; open my $fh, "<:crlf", \$fcontents; local $/ = "xxx"; local $_ = <$fh>; -- cgit v1.2.1