commit | 9f286447a7549327f6d685c2e0f8ae01277ea67e | [log] [tgz] |
---|---|---|
author | Julien Desprez <jdesprez@google.com> | Mon Apr 13 10:30:04 2020 -0700 |
committer | Julien Desprez <jdesprez@google.com> | Mon Apr 13 10:30:04 2020 -0700 |
tree | d7fc36e1c7ff869a4322a490e1274ffa6d790dc2 | |
parent | d50f5908e5b0d2675766aecaa46646b0430657f2 [diff] |
Make sandbox interruptable Test: unit tests Bug: 153606639 Change-Id: I3d90d06e673a57f6f339b3a673a0afe897245c0e
diff --git a/src/com/android/tradefed/sandbox/TradefedSandbox.java b/src/com/android/tradefed/sandbox/TradefedSandbox.java index 9718642..e45b91e 100644 --- a/src/com/android/tradefed/sandbox/TradefedSandbox.java +++ b/src/com/android/tradefed/sandbox/TradefedSandbox.java
@@ -120,7 +120,8 @@ } long timeout = config.getCommandOptions().getInvocationTimeout(); - mRunUtil.allowInterrupt(false); + // Allow interruption, subprocess should handle signals itself + mRunUtil.allowInterrupt(true); CommandResult result = mRunUtil.runTimedCmd(timeout, mStdout, mStderr, mCmdArgs.toArray(new String[0])); // Log stdout and stderr