diff options
author | 2017-08-08 13:08:24 +0200 | |
---|---|---|
committer | 2017-08-09 11:27:20 +0200 | |
commit | deab0cf4184ed32d8f76efc3c33aefae8b54603d (patch) | |
tree | 8ce36f8bf3d4b3b1377e70b300185b08139c9972 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 3cb136d5451e9d8af58f9a99990cad0592df101a (diff) |
Use java.time.Duration for timeouts
PiperOrigin-RevId: 164577062
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java index 38d61a1ae8..8a58468ac7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java @@ -46,6 +46,7 @@ import com.google.devtools.common.options.TriState; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -401,9 +402,9 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa } } - public void setupEnvVariables(Map<String, String> env, int timeoutInSeconds) { + public void setupEnvVariables(Map<String, String> env, Duration timeout) { env.put("TEST_SIZE", getTestProperties().getSize().toString()); - env.put("TEST_TIMEOUT", Integer.toString(timeoutInSeconds)); + env.put("TEST_TIMEOUT", Long.toString(timeout.getSeconds())); env.put("TEST_WORKSPACE", getRunfilesPrefix()); env.put( "TEST_BINARY", |