diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-02-21 13:31:57 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-02-21 13:31:57 +0000 |
| commit | 115e9681b8231e4672c4d1f4ad598dba6f23a54c (patch) | |
| tree | 1cd2a4ceede804e698b83dc469c19a76584c002a /Cross | |
| parent | 44bcdf2982dc8e16a1775b26b660a1716a7bf3be (diff) | |
| download | perl-115e9681b8231e4672c4d1f4ad598dba6f23a54c.tar.gz | |
In t/TEST, automatically detect if running under miniperl
Set $ENV{PERL_CORE_MINITEST} based on defined &DynaLoader::boot_DynaLoader,
instead of relying on a -minitest parameter. &DynaLoader::boot_DynaLoader is
undefined in miniperl, defined in perl, for both -Dusedl and -Uusedl
Diffstat (limited to 'Cross')
| -rw-r--r-- | Cross/Makefile-cross-SH | 4 | ||||
| -rw-r--r-- | Cross/Makefile.SH.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 65d496a583..756538d514 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -1130,7 +1130,7 @@ test.torture torturetest: test_prep minitest.utf16: minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ - && $(LDLIBPTH) ./perl TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty + && $(LDLIBPTH) ./perl TEST -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty test.utf16 check.utf16: test_prep PERL=./perl $(MAKE) TEST_ARGS=-utf16 _test @@ -1191,7 +1191,7 @@ minitest.prep: # is crashing. minitest: miniperl$(EXE_EXT) minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ - && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty + && $(LDLIBPTH) ./perl TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty # Test via harness diff --git a/Cross/Makefile.SH.patch b/Cross/Makefile.SH.patch index f21a1e43e3..953659c41f 100644 --- a/Cross/Makefile.SH.patch +++ b/Cross/Makefile.SH.patch @@ -185,5 +185,5 @@ -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep +minitest: lib/re.pm minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ - && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty + && $(LDLIBPTH) ./perl TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty |