CFI test: kill the other process in native code.

Killing it from Java does not seem reliable and the CFI
test tends to leave alive processes on the system.
This might be particularly troubling on the build bot.

Change-Id: I888b61037ab77fb4ff929762ea40af53f7a6ed6e

2 files changed, 4 insertions, 4 deletions

diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index 601fbaaea8..59722ad00d 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -188,7 +188,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_Main_unwindOtherProcess(JNIEnv*, jobj
     // Were not able to attach, bad.
     printf("Failed to attach to other process.\n");
     PLOG(ERROR) << "Failed to attach.";
-    kill(pid, SIGCONT);
+    kill(pid, SIGKILL);
     return JNI_FALSE;
   }
 
@@ -230,8 +230,8 @@ extern "C" JNIEXPORT jboolean JNICALL Java_Main_unwindOtherProcess(JNIEnv*, jobj
     PLOG(ERROR) << "Detach failed";
   }
 
-  // Continue the process so we can kill it on the Java side.
-  kill(pid, SIGCONT);
+  // Kill the other process once we are done with it.
+  kill(pid, SIGKILL);
 
   return result ? JNI_TRUE : JNI_FALSE;
 #else
diff --git a/test/137-cfi/src/Main.java b/test/137-cfi/src/Main.java
index a88adc1bcf..6cd187a033 100644
--- a/test/137-cfi/src/Main.java
+++ b/test/137-cfi/src/Main.java
@@ -103,7 +103,7 @@ public class Main implements Comparator<Main> {
               System.out.println("Unwinding other process failed.");
           }
       } finally {
-          // Kill the forked process.
+          // Kill the forked process if it is not already dead.
           p.destroy();
       }
   }