summaryrefslogtreecommitdiff
path: root/lib/Unicode
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2003-03-12 10:52:17 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2003-03-12 10:52:17 +0000
commit63c6dcc1775b960c3418c4c23568c59231321ed1 (patch)
tree528363eb7ff155c88cd4cfb247b2bbd5fe807b4b /lib/Unicode
parent7d4724a48fc64f7514654a326453c9b631d3a294 (diff)
downloadperl-63c6dcc1775b960c3418c4c23568c59231321ed1.tar.gz
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
Diffstat (limited to 'lib/Unicode')
-rw-r--r--lib/Unicode/Collate/t/index.t2
-rw-r--r--lib/Unicode/Collate/t/test.t2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Unicode/Collate/t/index.t b/lib/Unicode/Collate/t/index.t
index 75fcccf29f..e759ef22d1 100644
--- a/lib/Unicode/Collate/t/index.t
+++ b/lib/Unicode/Collate/t/index.t
@@ -9,7 +9,7 @@ BEGIN {
BEGIN {
if ($ENV{PERL_CORE}) {
chdir('t') if -d 't';
- @INC = qw(../lib);
+ @INC = $^O eq 'MacOS' ? qw(::lib) : qw(../lib);
}
}
diff --git a/lib/Unicode/Collate/t/test.t b/lib/Unicode/Collate/t/test.t
index 971ad6768c..777e9fb111 100644
--- a/lib/Unicode/Collate/t/test.t
+++ b/lib/Unicode/Collate/t/test.t
@@ -9,7 +9,7 @@ BEGIN {
BEGIN {
if ($ENV{PERL_CORE}) {
chdir('t') if -d 't';
- @INC = qw(../lib);
+ @INC = $^O eq 'MacOS' ? qw(::lib) : qw(../lib);
}
}