[Python-checkins] r46817 - python/trunk/Tools/buildbot/Makefile python/trunk/Tools/buildbot/kill_python.c

Sat Jun 10 10:14:03 CEST 2006

Author: martin.v.loewis
Date: Sat Jun 10 10:14:03 2006
New Revision: 46817
Added:
 python/trunk/Tools/buildbot/Makefile (contents, props changed)
Modified:
 python/trunk/Tools/buildbot/kill_python.c
Log:
Port cygwin kill_python changes from 2.4 branch.
Added: python/trunk/Tools/buildbot/Makefile
==============================================================================

--- (empty file)
+++ python/trunk/Tools/buildbot/Makefile	Sat Jun 10 10:14:03 2006
@@ -0,0 +1,6 @@
+all:	kill_python.exe
+	./kill_python.exe
+
+kill_python.exe:	kill_python.c
+	gcc -o kill_python.exe kill_python.c -lpsapi
+
Modified: python/trunk/Tools/buildbot/kill_python.c
==============================================================================
--- python/trunk/Tools/buildbot/kill_python.c	(original)
+++ python/trunk/Tools/buildbot/kill_python.c	Sat Jun 10 10:14:03 2006
@@ -42,7 +42,8 @@
 
 		_strlwr(path);
 		/* printf("%s\n", path); */
-		if (strstr(path, "build\\pcbuild\\python_d.exe") != NULL) {
+		if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) ||
+		 (strstr(path, "build\\python.exe") != NULL)) {
 			printf("Terminating %s (pid %d)\n", path, pids[i]);
 			if (!TerminateProcess(hProcess, 1)) {
 				printf("Termination failed: %d\n", GetLastError());
