Rename binary again; increase noise; stop trying to actually kill the process.

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index e96323c5b9e615a239093f9ca00ab0dc02c550f4..3ab548e7d121b3ad69e8f5cc20ba09a411287889 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,5 +1,5 @@
 @rem Used by the buildbot "compile" step.
 cmd /c Tools\buildbot\external.bat
 call "%VS71COMNTOOLS%vsvars32.bat"
-cmd /q/c Tools\buildbot\kill_python.bat
+cmd /c Tools\buildbot\kill_python.bat
 devenv.com /useenv /build Debug PCbuild\pcbuild.sln

diff --git a/Tools/buildbot/kill_python.bat b/Tools/buildbot/kill_python.bat
index 8688fd88e75dd642764b9d959e457b0f2cf3d23d..e068cc7913077f74d355fc8c67ed90f9327725b2 100644 (file)
--- a/Tools/buildbot/kill_python.bat
+++ b/Tools/buildbot/kill_python.bat
@@ -1,3 +1,3 @@
 cd Tools\buildbot
 nmake /f kill_python.mak
-kill_python3.exe
+kill_python4.exe

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index f84df1d5a32ceaa7cf7baa95eb688772c9e7fb0b..66d6f7f235e6c045f311dab9068dadf597db0673 100644 (file)
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -44,6 +44,7 @@ int main()
                _strlwr(path);
                printf("%s\n", path);
                 fflush(stdout);
+                /*
                if (strstr(path, "build\\pcbuild\\python_d.exe") != NULL) {
                        printf("Terminating %s (pid %d)\n", path, pids[i]);
                        if (!TerminateProcess(hProcess, 1)) {
@@ -52,6 +53,7 @@ int main()
                        }
                        return 0;
                }
+                */
 
                CloseHandle(hProcess);
        }

diff --git a/Tools/buildbot/kill_python.mak b/Tools/buildbot/kill_python.mak
index ce31d18af4fcaa04cdb1fd5c90ba46d37b5dca9c..f8be443ecb745d8ed5ea300c4d34625679b20483 100644 (file)
--- a/Tools/buildbot/kill_python.mak
+++ b/Tools/buildbot/kill_python.mak
@@ -1,2 +1,2 @@
 kill_python.exe:       kill_python.c
-               cl -nologo -o kill_python3.exe kill_python.c psapi.lib
+               cl -nologo -o kill_python4.exe kill_python.c psapi.lib