OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d676227
)
Revert "Increase timeout for the 570-checker-osr test from 20s to 60s."
author
Vladimir Marko
<vmarko@google.com>
Wed, 20 Apr 2016 09:06:08 +0000
(09:06 +0000)
committer
Vladimir Marko
<vmarko@google.com>
Wed, 20 Apr 2016 09:06:08 +0000
(09:06 +0000)
The timeout was an actual test failure, fixed by
https://android-review.googlesource.com/217041
Bug:
28210356
This reverts commit
d676227d8fcef3c3d34f1a7a44141b4f5f2e8519
.
Change-Id: If69e09f3650f87cd4e6e22bb28a7b807be3094e1
test/570-checker-osr/src/Main.java
patch
|
blob
|
history
diff --git
a/test/570-checker-osr/src/Main.java
b/test/570-checker-osr/src/Main.java
index
ba839bf
..
f22a0c1
100644
(file)
--- 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(
60 * 1000); // 6
0s timeout.
+ testThread.join(
20 * 1000); // 2
0s timeout.
} catch (InterruptedException ie) {
System.out.println("Interrupted.");
System.exit(1);