diff options
author | 2017-11-30 07:47:46 -0800 | |
---|---|---|
committer | 2017-11-30 07:49:45 -0800 | |
commit | 27221aa6c933dba366de33700d7a0a41abf51263 (patch) | |
tree | 97e368c4e3a3eb82a04861e8c083dc3a2c4f64e2 /src/main/java/com/google/devtools | |
parent | dbf6bcceb4b0a0e647a531a2bddb9f1359fc5083 (diff) |
Make "timeout" a constant in ExecutionRequirements
PiperOrigin-RevId: 177453738
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ExecutionRequirements.java | 3 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/Spawns.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ExecutionRequirements.java b/src/main/java/com/google/devtools/build/lib/actions/ExecutionRequirements.java index fced3688b0..f9e549ff77 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ExecutionRequirements.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ExecutionRequirements.java @@ -105,6 +105,9 @@ public class ExecutionRequirements { } } + /** If specified, the timeout of this action in seconds. Must be decimal integer. */ + public static final String TIMEOUT = "timeout"; + /** If an action would not successfully run other than on Darwin. */ public static final String REQUIRES_DARWIN = "requires-darwin"; diff --git a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java index 4448ea8f7b..a7b0e7ecf4 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java @@ -51,7 +51,7 @@ public final class Spawns { * Parse the timeout key in the spawn execution info, if it exists. Otherwise, return -1. */ public static Duration getTimeout(Spawn spawn) throws ExecException { - String timeoutStr = spawn.getExecutionInfo().get("timeout"); + String timeoutStr = spawn.getExecutionInfo().get(ExecutionRequirements.TIMEOUT); if (timeoutStr == null) { return Duration.ZERO; } |