diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-04-17 10:39:39 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-04-17 10:39:39 (GMT) |
| commit | ce8607df96dcc8cc771b8be1a1169a0f6817db4b (patch) | |
| tree | c86394101277a0eab6c240dec8c4e1d6ead30913 /Tools | |
| parent | c97c11958d5fc9aa7cb30367fe7f463ac27afdf0 (diff) | |
| download | cpython-ce8607df96dcc8cc771b8be1a1169a0f6817db4b.zip cpython-ce8607df96dcc8cc771b8be1a1169a0f6817db4b.tar.gz cpython-ce8607df96dcc8cc771b8be1a1169a0f6817db4b.tar.bz2 | |
Revert to 45478, disable kill_python command for now.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/buildbot/build.bat | 2 | ||||
| -rw-r--r-- | Tools/buildbot/kill_python.bat | 5 | ||||
| -rw-r--r-- | Tools/buildbot/kill_python.c | 8 | ||||
| -rw-r--r-- | Tools/buildbot/kill_python.mak | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat index 3ab548e..dc2cccb 100644 --- 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 7972bc4..d78b6d4 100644 --- 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 66d6f7f..46a14b7 100644 --- 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 f8be443..6027d3f 100644 --- 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 |