From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 5 May 2013 19:36:09 +0000 (+0300)
Subject: #17883: Fix buildbot testing of Tkinter on Windows.  Patch by Zachary Ware.
X-Git-Tag: v2.7.5~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a4f39416580b4e4f0f39aca31ad2f5ef149f603;p=thirdparty%2FPython%2Fcpython.git

#17883: Fix buildbot testing of Tkinter on Windows.  Patch by Zachary Ware.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0691ad339566..1fe11be38a64 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,9 @@ Library
 Tests
 -----
 
+- Issue #17883: Fix buildbot testing of Tkinter on Windows.
+  Patch by Zachary Ware.
+
 - Issue #7855: Add tests for ctypes/winreg for issues found in IronPython.
   Initial patch by Dino Viehland.
 
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index ee1661a21ab5..9da1ed1b3970 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -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