Revert to 45478, disable kill_python command for now.

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index 3ab548e7d121b3ad69e8f5cc20ba09a411287889..dc2cccb5c05e8f4724c34af2a1b66a94496a1f64 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 /c Tools\buildbot\kill_python.bat
+@rem cmd /q/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 7972bc492aa94810c725c14a2195129e2fb7598f..d78b6d4c40a60a05c206bd5b3b9b5c3c323f33da 100644 (file)
--- a/Tools/buildbot/kill_python.bat
+++ b/Tools/buildbot/kill_python.bat
@@ -1,4 +1,3 @@
 cd Tools\buildbot
-dir
-nmake /f kill_python.mak
-kill_python4.exe
+nmake /C /S /f kill_python.mak
+kill_python.exe

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index 66d6f7f235e6c045f311dab9068dadf597db0673..46a14b78a204d7b9ffdc0b53f7d594a84c0df21a 100644 (file)
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -13,7 +13,6 @@ int main()
                return 1;
        }
        num_processes = cbNeeded/sizeof(pids[0]);
-        printf("%d processes\n", num_processes);
        for (i = 0; i < num_processes; i++) {
                HANDLE hProcess;
                char path[MAX_PATH];
@@ -42,9 +41,7 @@ int main()
                }
 
                _strlwr(path);
-               printf("%s\n", path);
-                fflush(stdout);
-                /*
+               /* printf("%s\n", path); */
                if (strstr(path, "build\\pcbuild\\python_d.exe") != NULL) {
                        printf("Terminating %s (pid %d)\n", path, pids[i]);
                        if (!TerminateProcess(hProcess, 1)) {
@@ -53,8 +50,7 @@ int main()
                        }
                        return 0;
                }
-                */
 
                CloseHandle(hProcess);
        }
-}
+}
\ No newline at end of file

diff --git a/Tools/buildbot/kill_python.mak b/Tools/buildbot/kill_python.mak
index f8be443ecb745d8ed5ea300c4d34625679b20483..6027d3f9b1d623c1aeb17165688e0fe62853e29a 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_python4.exe kill_python.c psapi.lib
+               cl -nologo -o kill_python.exe kill_python.c psapi.lib