diff options
| author | Steve Hay <SteveHay@planit.com> | 2004-03-12 15:52:23 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-03-12 18:26:34 +0000 |
| commit | a8b2ffcab3683d01c70a0b039d766e75d4f47d90 (patch) | |
| tree | 3c710cb8b312d72e53f1071afeffec8c7d9ebb57 | |
| parent | 4974489e821a25aaa60fce7e4a9334be57af2936 (diff) | |
| download | perl-a8b2ffcab3683d01c70a0b039d766e75d4f47d90.tar.gz | |
Fix minitest target in Win32 makefiles
Message-ID: <4051DCB7.107@uk.radan.com>
p4raw-id: //depot/perl@22489
| -rw-r--r-- | win32/Makefile | 10 | ||||
| -rw-r--r-- | win32/makefile.mk | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/win32/Makefile b/win32/Makefile index d84b4a855f..0d45d09188 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1124,13 +1124,13 @@ inst_lib : $(CONFIGPM) $(RCOPY) ..\lib $(INST_LIB)\*.* minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils - $(XCOPY) $(MINIPERL) ..\t\perl.exe + $(XCOPY) $(MINIPERL) ..\t\$(NULL) + if exist ..\t\perl.exe del /f ..\t\perl.exe + rename ..\t\miniperl.exe perl.exe $(XCOPY) $(GLOBEXE) ..\t\$(NULL) attrib -r ..\t\*.* - copy test ..\t - cd ..\t - $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t - cd ..\win32 + cd ..\t && \ + $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t test-prep : all utils $(XCOPY) $(PERLEXE) ..\t\$(NULL) diff --git a/win32/makefile.mk b/win32/makefile.mk index 214799565d..03476dd26a 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1257,16 +1257,17 @@ inst_lib : $(CONFIGPM) $(RCOPY) ..\lib $(INST_LIB)\*.* minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils - $(XCOPY) $(MINIPERL) ..\t\perl.exe + $(XCOPY) $(MINIPERL) ..\t\$(NULL) + if exist ..\t\perl.exe del /f ..\t\perl.exe + rename ..\t\miniperl.exe perl.exe .IF "$(CCTYPE)" == "BORLAND" $(XCOPY) $(GLOBBAT) ..\t\$(NULL) .ELSE $(XCOPY) $(GLOBEXE) ..\t\$(NULL) .ENDIF attrib -r ..\t\*.* - copy test ..\t cd ..\t && \ - $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t + $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t test-prep : all utils $(XCOPY) $(PERLEXE) ..\t\$(NULL) |