summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-03-14 13:56:09 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-03-14 13:56:09 (GMT)
commitbf7b0b7b81ac19cab40056c56d2042154cc1515b (patch)
tree5f54669f5bbbdb6872469c66935e61e5235b49e8
parent10d7603825a9db1079a736ca709f88fe67d0b0e5 (diff)
downloadcpython-bf7b0b7b81ac19cab40056c56d2042154cc1515b.zip
cpython-bf7b0b7b81ac19cab40056c56d2042154cc1515b.tar.gz
cpython-bf7b0b7b81ac19cab40056c56d2042154cc1515b.tar.bz2
Patch #2284: add -x64 option to rt.bat.
-rw-r--r--Misc/NEWS4
-rw-r--r--PCbuild/rt.bat14
2 files changed, 14 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 93280aa..65ce4c0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -63,6 +63,10 @@ Tests
- Patch #2232: os.tmpfile might fail on Windows if the user has no
permission to create files in the root directory.
+Build
+-----
+
+- Patch #2284: Add -x64 option to rt.bat.
What's New in Python 2.6 alpha 1?
=================================
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 8e386c5..583d4f3 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -1,11 +1,13 @@
@echo off
rem Run Tests. Run the regression test suite.
-rem Usage: rt [-d] [-O] [-q] regrtest_args
+rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args
rem -d Run Debug build (python_d.exe). Else release build.
rem -O Run python.exe or python_d.exe (see -d) with -O.
rem -q "quick" -- normally the tests are run twice, the first time
rem after deleting all the .py[co] files reachable from Lib/.
rem -q runs the tests just once, and without deleting .py[co] files.
+rem -x64 Run the 64-bit build of python (or python_d if -d was specified)
+rem from the 'amd64' dir instead of the 32-bit build in this dir.
rem All leading instances of these switches are shifted off, and
rem whatever remains is passed to regrtest.py. For example,
rem rt -O -d -x test_thread
@@ -24,16 +26,20 @@ rem rt -u "network,largefile"
setlocal
-set exe=python
+set prefix=.\
+set suffix=
set qmode=
set dashO=
-PATH %PATH%;..\..\tcltk\bin
+set tcltk=
:CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
-if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts
+if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
+if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
+PATH %PATH%;..\..\%tcltk%\bin
+set exe=%prefix%\python%suffix%
set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode