ANRdaemon: move trace result from /sdcard to /data am: d93aa41807

[android-x86/system-extras.git] / simpleperf / workload_test.cpp

diff --git a/simpleperf/workload_test.cpp b/simpleperf/workload_test.cpp
index f250328..eb1e345 100644 (file)
--- a/simpleperf/workload_test.cpp
+++ b/simpleperf/workload_test.cpp
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 
+#include "scoped_signal_handler.h"
 #include "utils.h"
 #include "workload.h"
 
@@ -28,7 +29,7 @@ static void signal_handler(int) {
 
 TEST(workload, success) {
   signaled = false;
-  SignalHandlerRegister signal_handler_register({SIGCHLD}, signal_handler);
+  ScopedSignalHandler scoped_signal_handler({SIGCHLD}, signal_handler);
   auto workload = Workload::CreateWorkload({"sleep", "1"});
   ASSERT_TRUE(workload != nullptr);
   ASSERT_TRUE(workload->GetPid() != 0);
@@ -46,11 +47,11 @@ TEST(workload, execvp_failure) {
 static void run_signaled_workload() {
   {
     signaled = false;
-    SignalHandlerRegister signal_handler_register({SIGCHLD}, signal_handler);
+    ScopedSignalHandler scoped_signal_handler({SIGCHLD}, signal_handler);
     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) {
     }
   }
@@ -66,7 +67,7 @@ TEST(workload, signaled_warning) {
 static void run_exit_nonzero_workload() {
   {
     signaled = false;
-    SignalHandlerRegister signal_handler_register({SIGCHLD}, signal_handler);
+    ScopedSignalHandler scoped_signal_handler({SIGCHLD}, signal_handler);
     auto workload = Workload::CreateWorkload({"ls", "nonexistdir"});
     ASSERT_TRUE(workload != nullptr);
     ASSERT_TRUE(workload->Start());