[Python-checkins] cpython (merge 3.2 -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/2d6745f219b3
changeset:   68985:2d6745f219b3
parent:      68982:439e185c3a7b
parent:      68984:9dc527ae8b85
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Mar 26 21:18:44 2011 +0100
summary:
  Merge

files:
  Tools/buildbot/clean-amd64.bat |  5 ++++-
  Tools/buildbot/clean.bat       |  3 +++
  2 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,7 +1,10 @@
 @rem Used by the buildbot "clean" step.
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
+ at echo Deleting test leftovers ...
+rmdir /s /q build
+cd PCbuild
 vcbuild /clean pcbuild.sln "Release|x64"
 vcbuild /clean pcbuild.sln "Debug|x64"
+cd ..
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -2,6 +2,9 @@
 call "%VS90COMNTOOLS%vsvars32.bat"
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
+ at echo Deleting test leftovers ...
+rmdir /s /q build
 cd PCbuild
 vcbuild /clean pcbuild.sln "Release|Win32"
 vcbuild /clean pcbuild.sln "Debug|Win32"
+cd ..

-- 
Repository URL: http://hg.python.org/cpython