diff options
| -rw-r--r-- | djgpp/config.over | 1 | ||||
| -rw-r--r-- | djgpp/configure.bat | 2 | ||||
| -rw-r--r-- | djgpp/djgppsed.sh | 3 | ||||
| -rwxr-xr-x | t/lib/glob-basic.t | 6 | ||||
| -rwxr-xr-x | t/lib/glob-case.t | 5 | ||||
| -rwxr-xr-x | t/lib/glob-global.t | 6 | ||||
| -rwxr-xr-x | t/lib/glob-taint.t | 5 | ||||
| -rw-r--r-- | t/lib/io_unix.t | 1 |
8 files changed, 25 insertions, 4 deletions
diff --git a/djgpp/config.over b/djgpp/config.over index f47e7fca91..1f567b4174 100644 --- a/djgpp/config.over +++ b/djgpp/config.over @@ -29,6 +29,7 @@ repair() -e 's/byteload/ByteLoader/'\ -e 's=devel/peek=Devel/Peek='\ -e 's=devel/dprof=Devel/DProf='\ + -e 's=sys/sys=Sys/Sys='\ -e 's=file/=='\ -e 's=File/=='\ -e 's=glob=='\ diff --git a/djgpp/configure.bat b/djgpp/configure.bat index e7d41d7130..370f5ed048 100644 --- a/djgpp/configure.bat +++ b/djgpp/configure.bat @@ -33,5 +33,5 @@ echo Running sed... sh djgpp/djgppsed.sh echo Running Configure... -sh Configure %1 %2 %3 %4 %5 %6 %7 %8 %9 +sh Configure -DPERL_EXTERNAL_GLOB %1 %2 %3 %4 %5 %6 %7 %8 %9 :end diff --git a/djgpp/djgppsed.sh b/djgpp/djgppsed.sh index b62acfd6e9..bb95ad8538 100644 --- a/djgpp/djgppsed.sh +++ b/djgpp/djgppsed.sh @@ -24,6 +24,7 @@ SDBHASH='s=dbhash\.tmp=dbhash_tmp=g' SSTAT='s=\.\(stat\.\)=_\1=g' STMP2='s=tmp2=tm2=g' SPACKLIST='s=\.\(packlist\)=_\1=g' +SDOTTMP='s=\.tmp=_tmp=g' sed -e $SCONFIG -e $SGREPTMP -e $SECHOTMP -e $SDDC -e $SOUT -e 's=\.\( \./\$file\)$=sh\1=g' Configure |tr -d '\r' >s; mv -f s Configure sed -e $SEXISTS -e $SLIST -e $SCONFIG Makefile.SH |tr -d '\r' >s; mv -f s Makefile.SH @@ -33,7 +34,7 @@ sed -e $SEXISTS -e $SPACKLIST installperl >s; mv -f s installperl sed -e $SPOD2HTML lib/Pod/Html.pm |tr -d '\r' >s; mv -f s lib/Pod/Html.pm sed -e $SCC -e $SLIST -e $SFILEC -e $SCOR -e $SDEPTMP -e $SHSED makedepend.SH |tr -d '\r' >s; mv -f s makedepend.SH sed -e $SCPP t/comp/cpp.aux |tr -d '\r' >s; mv -f s t/comp/cpp.aux -sed -e $SARGV t/io/argv.t >s; mv -f s t/io/argv.t +sed -e $SARGV -e $SDOTTMP t/io/argv.t >s; mv -f s t/io/argv.t sed -e $SABC t/io/inplace.t >s; mv -f s t/io/inplace.t sed -e $SDBMX t/lib/anydbm.t >s; mv -f s t/lib/anydbm.t sed -e $SDBMX -e $SDBHASH t/lib/gdbm.t >s; mv -f s t/lib/gdbm.t diff --git a/t/lib/glob-basic.t b/t/lib/glob-basic.t index dde87730c0..a2479ac8c1 100755 --- a/t/lib/glob-basic.t +++ b/t/lib/glob-basic.t @@ -3,7 +3,11 @@ BEGIN { chdir 't' if -d 't'; unshift @INC, '../lib'; - + require Config; import Config; + if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { + print "1..0\n"; + exit 0; + } print "1..9\n"; } END { diff --git a/t/lib/glob-case.t b/t/lib/glob-case.t index 2e65a0fc8b..32719b2d9a 100755 --- a/t/lib/glob-case.t +++ b/t/lib/glob-case.t @@ -3,6 +3,11 @@ BEGIN { chdir 't' if -d 't'; unshift @INC, '../lib'; + require Config; import Config; + if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { + print "1..0\n"; + exit 0; + } print "1..7\n"; } END { diff --git a/t/lib/glob-global.t b/t/lib/glob-global.t index 44d7e8b5c3..9d273bd1ed 100755 --- a/t/lib/glob-global.t +++ b/t/lib/glob-global.t @@ -3,7 +3,11 @@ BEGIN { chdir 't' if -d 't'; unshift @INC, '../lib'; - + require Config; import Config; + if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { + print "1..0\n"; + exit 0; + } print "1..10\n"; } END { diff --git a/t/lib/glob-taint.t b/t/lib/glob-taint.t index 1b9c053bf7..a8dc213853 100755 --- a/t/lib/glob-taint.t +++ b/t/lib/glob-taint.t @@ -3,6 +3,11 @@ BEGIN { chdir 't' if -d 't'; unshift @INC, '../lib'; + require Config; import Config; + if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { + print "1..0\n"; + exit 0; + } print "1..2\n"; } END { diff --git a/t/lib/io_unix.t b/t/lib/io_unix.t index 0e559e0d90..62569a5844 100644 --- a/t/lib/io_unix.t +++ b/t/lib/io_unix.t @@ -8,6 +8,7 @@ BEGIN { # ``use IO::Socket'' executes too early below in the os2 block if ($^O eq 'dos') { print "1..0 # Skip: no fork\n"; + exit 0; } } |