Revert change #22489, that seems to cause build failures on Windows.

p4raw-link: @22489 on //depot/perl: 590d29db556974e9ffeb477a1a1932ff001d099f

p4raw-id: //depot/perl@22495

diff --git a/win32/Makefile b/win32/Makefile
index 0d45d09..d84b4a8 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1124,13 +1124,13 @@ inst_lib : $(CONFIGPM)
        $(RCOPY) ..\lib $(INST_LIB)\*.*
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
        $(RCOPY) ..\lib $(INST_LIB)\*.*
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils

-       $(XCOPY) $(MINIPERL) ..\t\$(NULL)
-       if exist ..\t\perl.exe del /f ..\t\perl.exe
-       rename ..\t\miniperl.exe perl.exe
+       $(XCOPY) $(MINIPERL) ..\t\perl.exe

        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
        attrib -r ..\t\*.*
        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
        attrib -r ..\t\*.*

-       cd ..\t && \
-       $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+       copy test ..\t
+       cd ..\t
+       $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+       cd ..\win32

 
 test-prep : all utils
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)
 
 test-prep : all utils
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 03476dd..2147995 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1257,17 +1257,16 @@ inst_lib : $(CONFIGPM)
        $(RCOPY) ..\lib $(INST_LIB)\*.*
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
        $(RCOPY) ..\lib $(INST_LIB)\*.*
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils

-       $(XCOPY) $(MINIPERL) ..\t\$(NULL)
-       if exist ..\t\perl.exe del /f ..\t\perl.exe
-       rename ..\t\miniperl.exe perl.exe
+       $(XCOPY) $(MINIPERL) ..\t\perl.exe

 .IF "$(CCTYPE)" == "BORLAND"
        $(XCOPY) $(GLOBBAT) ..\t\$(NULL)
 .ELSE
        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
 .ENDIF
        attrib -r ..\t\*.*
 .IF "$(CCTYPE)" == "BORLAND"
        $(XCOPY) $(GLOBBAT) ..\t\$(NULL)
 .ELSE
        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
 .ENDIF
        attrib -r ..\t\*.*

+       copy test ..\t

        cd ..\t && \
        cd ..\t && \

-       $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+       $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t

 
 test-prep : all utils
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)
 
 test-prep : all utils
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)