[Python-checkins] r81798 - in python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests: Makefile.unix Makefile.vc README.txt runallconfigs.bat runallconfigs.sh

[stefan.krah]

Author: stefan.krah
Date: Mon Jun  7 13:54:23 2010
New Revision: 81798

Log:
New values for the MACHINE variable.

Modified:
   python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.unix
   python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.vc
   python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/README.txt
   python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.bat
   python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.sh

Modified: python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.unix
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.unix	(original)
+++ python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.unix	Mon Jun  7 13:54:23 2010
@@ -7,6 +7,10 @@
 endif
 
 ifeq ($(MACHINE), ansi64)
+CFLAGS = -DCONFIG_64 -DHAVE_UINT128_T -DTEST_UINT128_T -Wall -W -O2 -fomit-frame-pointer -s
+endif
+
+ifeq ($(MACHINE), ansi64c32)
 CFLAGS = -DCONFIG_32 -DANSI -Wall -W -O2 -fomit-frame-pointer -s
 endif
 
@@ -14,12 +18,12 @@
 CFLAGS = -m32 -DCONFIG_32 -DPPRO -Wall -W -O2 -fomit-frame-pointer -s
 endif
 
-ifeq ($(MACHINE), ansi)
+ifeq ($(MACHINE), ansi32)
 CFLAGS = -m32 -DCONFIG_32 -DANSI -Wall -W -O2 -fomit-frame-pointer -s
 endif
 
 ifeq ($(MACHINE), ansi-legacy)
-CFLAGS = -m32 -DCONFIG_32 -DANSI -DLEGACY_COMPILER -Wall -W -O2 -fomit-frame-pointer -s
+CFLAGS = -DCONFIG_32 -DANSI -DLEGACY_COMPILER -Wall -W -O2 -fomit-frame-pointer -s
 endif
 
 

Modified: python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.vc
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.vc	(original)
+++ python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/Makefile.vc	Mon Jun  7 13:54:23 2010
@@ -21,7 +21,7 @@
 GMPINC = "C:\Program Files\gmp"
 !endif
 
-!if "$(MACHINE)" == "ansi64"
+!if "$(MACHINE)" == "ansi64c32"
 CFLAGS = /DCONFIG_32 /DANSI /W3 /D_CRT_SECURE_NO_WARNINGS /nologo /MT /Ox /GS /EHsc
 GMPLIB = "C:\Program Files\gmp\gmp.lib"
 GMPINC = "C:\Program Files\gmp"
@@ -33,7 +33,7 @@
 GMPINC = "C:\Program Files (x86)\gmp"
 !endif
 
-!if "$(MACHINE)" == "ansi"
+!if "$(MACHINE)" == "ansi32"
 CFLAGS = /DCONFIG_32 /DANSI /W3 /D_CRT_SECURE_NO_WARNINGS /nologo /MT /Ox /GS /EHsc
 GMPLIB = "C:\Program Files (x86)\gmp\gmp.lib"
 GMPINC = "C:\Program Files (x86)\gmp"

Modified: python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/README.txt
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/README.txt	(original)
+++ python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/README.txt	Mon Jun  7 13:54:23 2010
@@ -10,7 +10,7 @@
 1. Tests that do not require gmp:
 
    # Use gmake on *BSD
-   make MACHINE=[x64|ansi64|ppro|ansi|ansi-legacy] && ./runalltests.sh
+   make MACHINE=[x64|ansi64|ansi64c32|ppro|ansi32|ansi-legacy] && ./runalltests.sh
 
    This runs:
 
@@ -24,7 +24,7 @@
 2. Tests that require gmp:
 
    # Use gmake on *BSD
-   make MACHINE=[x64|ansi64|ppro|ansi|ansi-legacy] gmp && ./runalltests.sh
+   make MACHINE=[x64|ansi64|ansi64c32|ppro|ansi32|ansi-legacy] gmp && ./runalltests.sh
 
    This runs all the above tests and:
 

Modified: python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.bat
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.bat	(original)
+++ python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.bat	Mon Jun  7 13:54:23 2010
@@ -16,11 +16,11 @@
 
 echo.
 echo # ========================================================================
-echo #                                 ansi64
+echo #                               ansi64c32
 echo # ========================================================================
 echo.
 nmake clean
-nmake MACHINE=ansi64 gmp
+nmake MACHINE=ansi64c32 gmp
 call runalltests.bat
 
 
@@ -37,11 +37,11 @@
 
 echo.
 echo # ========================================================================
-echo #                                  ansi
+echo #                                 ansi32
 echo # ========================================================================
 echo.
 nmake clean
-nmake MACHINE=ansi gmp
+nmake MACHINE=ansi32 gmp
 call runalltests.bat
 
 echo.

Modified: python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.sh
==============================================================================
--- python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.sh	(original)
+++ python/branches/py3k-cdecimal/Lib/test/decimal_extended_tests/c_tests/runallconfigs.sh	Mon Jun  7 13:54:23 2010
@@ -2,7 +2,7 @@
 
 
 VALGRIND=
-if [ "$1" == "--valgrind" ]; then
+if [ X"$1" = X"--valgrind" ]; then
     shift
     VALGRIND="valgrind --tool=memcheck --leak-check=full --leak-resolution=high --db-attach=yes --show-reachable=yes"
 fi
@@ -11,7 +11,7 @@
 if [ X"$@" != X"" ]; then
     CONFIGS="$@"
 else
-    CONFIGS="x64 ansi64 ppro ansi ansi-legacy"
+    CONFIGS="x64 ansi64 ansi64c32 ppro ansi32 ansi-legacy"
 fi
 
 GMAKE=`which gmake`