Simpleperf: fix flaky workload unit tests.

Move SIGABRT to SIGKILL to make sure the child process is terminated by a signal.
SIGABRT can't guarantee this because the child process can install signal handler for SIGABRT.

Add a final _exit(1) after ChildProcessFn in case execvp() fails.

Change-Id: I353720b10c6ea42826efcafce5ff2699fd246e22

diff --git a/simpleperf/workload.cpp b/simpleperf/workload.cpp
index 42a5fdd..56870a7 100644 (file)
--- a/simpleperf/workload.cpp
+++ b/simpleperf/workload.cpp
@@ -78,6 +78,7 @@ bool Workload::CreateNewProcess() {
     close(start_signal_pipe[1]);
     close(exec_child_pipe[0]);
     ChildProcessFn(args_, start_signal_pipe[0], exec_child_pipe[1]);
+    _exit(0);
   }
   // In parent process.
   close(start_signal_pipe[0]);

diff --git a/simpleperf/workload_test.cpp b/simpleperf/workload_test.cpp
index f250328..f4c1601 100644 (file)
--- a/simpleperf/workload_test.cpp
+++ b/simpleperf/workload_test.cpp
@@ -50,7 +50,7 @@ static void run_signaled_workload() {
     auto workload = Workload::CreateWorkload({"sleep", "10"});
     ASSERT_TRUE(workload != nullptr);
     ASSERT_TRUE(workload->Start());
-    ASSERT_EQ(0, kill(workload->GetPid(), SIGABRT));
+    ASSERT_EQ(0, kill(workload->GetPid(), SIGKILL));
     while (!signaled) {
     }
   }