[Python-checkins] r86361 - in python/branches/py3k-cdecimal/Lib/test/mpdecimal: tests/runallconfigs.bat tests/runallconfigs.sh vars.mk

[stefan.krah]

Author: stefan.krah
Date: Tue Nov  9 15:03:24 2010
New Revision: 86361

Log:
1) Add vars.mk to avoid error message.

2) runallconfigs.sh: make patching easier to understand. 

3) runallconfigs.bat: don't clobber mpdecimal.h, apply fullcov_header.patch.



Added:
   python/branches/py3k-cdecimal/Lib/test/mpdecimal/vars.mk   (contents, props changed)
Modified:
   python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.bat
   python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.sh

Modified: python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.bat
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.bat	(original)
+++ python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.bat	Tue Nov  9 15:03:24 2010
@@ -15,7 +15,6 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal64vc.h mpdecimal.h
 nmake MACHINE=x64 extended_gmp
 cd tests
 call runalltests.bat
@@ -28,7 +27,6 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal64vc.h mpdecimal.h
 nmake MACHINE=ansi64 extended_gmp
 cd tests
 call runalltests.bat
@@ -41,8 +39,9 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal32vc.h mpdecimal.h
+patch < tests\fullcov_header.patch
 nmake MACHINE=full_coverage extended_gmp
+patch -R < tests\fullcov_header.patch
 cd tests
 call runalltests.bat
 
@@ -56,7 +55,6 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal32vc.h mpdecimal.h
 nmake MACHINE=ppro extended_gmp
 cd tests
 call runalltests.bat
@@ -68,7 +66,6 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal32vc.h mpdecimal.h
 nmake MACHINE=ansi32 extended_gmp
 cd tests
 call runalltests.bat
@@ -80,7 +77,6 @@
 echo.
 cd ..\
 nmake clean
-copy /y mpdecimal32vc.h mpdecimal.h
 nmake MACHINE=ansi-legacy extended_gmp
 cd tests
 call runalltests.bat

Modified: python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.sh
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.sh	(original)
+++ python/branches/py3k-cdecimal/Lib/test/mpdecimal/tests/runallconfigs.sh	Tue Nov  9 15:03:24 2010
@@ -29,8 +29,11 @@
     ./configure MACHINE=$config
     if [ X"$config" = X"full_coverage" ]; then
         patch < tests/fullcov_header.patch
+        $GMAKE extended
+        patch -R < tests/fullcov_header.patch
+    else
+        $GMAKE extended
     fi
-    $GMAKE extended
     cd tests
     printf "\n"
     if [ X"$config" = X"ppro" ]; then
@@ -42,11 +45,6 @@
     else
         ./runalltests.sh
     fi
-    if [ X"$config" = X"full_coverage" ]; then
-        cd ..
-        patch -R < tests/fullcov_header.patch
-        cd tests
-    fi
 done
 
 

Added: python/branches/py3k-cdecimal/Lib/test/mpdecimal/vars.mk
==============================================================================
--- (empty file)
+++ python/branches/py3k-cdecimal/Lib/test/mpdecimal/vars.mk	Tue Nov  9 15:03:24 2010
@@ -0,0 +1 @@
+