Re: Smoke [5.9.1] 22491 FAIL(M) MSWin32 WinXP/.Net SP1 (x86/1 cpu)

Message-ID: <40558532.30002@uk.radan.com>

Plus, restore patch #22489

p4raw-id: //depot/perl@22501

diff --git a/win32/Makefile b/win32/Makefile
index d84b4a8..5483b74 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -962,11 +962,16 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
 
+# Note: The next two targets explicitly remove a "blibdirs.exists" file that
+# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved.
+
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
+       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 Extensions_realclean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 #----------------------------------------------------------------------------------
 
@@ -1124,13 +1129,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 2147995..c6f3abe 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1102,11 +1102,16 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 Extensions : buildext.pl $(PERLDEP) $(CONFIGPM)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
 
+# Note: The next two targets explicitly remove a "blibdirs.exists" file that
+# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved.
+
 Extensions_clean :
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
+       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 Extensions_realclean :
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+       -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists
 
 #----------------------------------------------------------------------------------
 
@@ -1257,16 +1262,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)