summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2016-04-19 15:18:30 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-04-19 15:18:31 +0000
commitda66e57c57eb3a70ee1569efa19ca897f7da735f (patch)
tree010188cbb68a08cc394f383b77db0f2e592e2ee5
parentc5c508d149a7eeae1121ca4b932e8c6ab024813f (diff)
parentd676227d8fcef3c3d34f1a7a44141b4f5f2e8519 (diff)
Merge "Increase timeout for the 570-checker-osr test from 20s to 60s."
-rw-r--r--test/570-checker-osr/src/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/570-checker-osr/src/Main.java b/test/570-checker-osr/src/Main.java
index f22a0c102f..ba839bfa48 100644
--- a/test/570-checker-osr/src/Main.java
+++ b/test/570-checker-osr/src/Main.java
@@ -24,7 +24,7 @@ public class Main {
};
testThread.start();
try {
- testThread.join(20 * 1000); // 20s timeout.
+ testThread.join(60 * 1000); // 60s timeout.
} catch (InterruptedException ie) {
System.out.println("Interrupted.");
System.exit(1);