Merged revisions 84857,84870,84875 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84857 | hirokazu.yamamoto | 2010-09-17 17:53:31 +0900 | 1 line

  Let's see if tcl/tk test runs on windows buildbot with this fix.
........
  r84870 | hirokazu.yamamoto | 2010-09-18 09:31:44 +0900 | 3 lines

  regrtest.py now runs python in build/test_python_xxx. (deeper than here)
  So failed to load tcl/tk dll because $(dist)/tcltk/bin was set to PATH as
  relative path. (Windows)
........
  r84875 | hirokazu.yamamoto | 2010-09-18 13:02:52 +0900 | 1 line

  Applied r84870 to older compilers.
........
This commit is contained in:
Hirokazu Yamamoto 2010-09-19 09:10:40 +00:00
parent 33f028b184
commit 0dd078a736
3 changed files with 4 additions and 4 deletions

View File

@ -27,7 +27,7 @@ setlocal
set exe=python
set qmode=
set dashO=
PATH %PATH%;..\..\..\tcltk\bin
PATH %PATH%;%~dp0..\..\..\tcltk\bin
:CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts

View File

@ -27,7 +27,7 @@ setlocal
set exe=python
set qmode=
set dashO=
PATH %PATH%;..\..\..\tcltk\bin
PATH %PATH%;%~dp0..\..\..\tcltk\bin
:CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts

View File

@ -30,7 +30,7 @@ set prefix=.\
set suffix=
set qmode=
set dashO=
set tcltk=
set tcltk=tcltk
:CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
@ -38,7 +38,7 @@ if "%1"=="-q" (set qmode=yes) & 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
PATH %PATH%;%~dp0..\..\%tcltk%\bin
set exe=%prefix%\python%suffix%
set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode