Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: sandbox/linux/tests/unit_tests.cc

Issue 1310773006: Update sandbox/linux from upstream (Closed) Base URL: ssh://ssh.github.com/domokit/mojo.git@master
Patch Set: Update to 3909ebfa69566f7374a6900e63cd4d3c73a35378 Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/linux/system_headers/linux_signal.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/tests/unit_tests.cc
diff --git a/sandbox/linux/tests/unit_tests.cc b/sandbox/linux/tests/unit_tests.cc
index 4973c41fbdcd1f8c4ea0f452cfb0541c38d9aeb4..7ea28156f979062f742793a57a68ba5250e753a4 100644
--- a/sandbox/linux/tests/unit_tests.cc
+++ b/sandbox/linux/tests/unit_tests.cc
@@ -31,8 +31,15 @@ std::string TestFailedMessage(const std::string& msg) {
}
int GetSubProcessTimeoutTimeInSeconds() {
- // Previously 10s, but that timed out (just) on Chromecast.
- return 12;
+#ifdef NDEBUG
+ // Chromecast build lab devices need this much time to complete.
+ // They only run in release.
+ return 30;
+#else
+ // Want a shorter timeout than test runner to get a useful callstack
+ // in debug.
+ return 10;
+#endif
}
// Returns the number of threads of the current process or -1.
« no previous file with comments | « sandbox/linux/system_headers/linux_signal.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698