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
diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index 601fbaa..59722ad 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -188,7 +188,7 @@
// 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 @@
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 a88adc1..6cd187a 100644
--- a/test/137-cfi/src/Main.java
+++ b/test/137-cfi/src/Main.java
@@ -103,7 +103,7 @@
System.out.println("Unwinding other process failed.");
}
} finally {
- // Kill the forked process.
+ // Kill the forked process if it is not already dead.
p.destroy();
}
}
