diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-30 16:14:21 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-10-30 16:14:21 +0100 |
| commit | f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2 (patch) | |
| tree | 1ac379e674a144c1c54d23c2ac1c5e0c9eb8f24d /lib/kernel | |
| parent | a8b2ba096dc48a29af52fd68070089d4bbb37483 (diff) | |
| parent | f17020af337cf34560e939d822229262a214f28d (diff) | |
| download | otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.tar.gz otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.tar.bz2 otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.zip | |
Merge branch 'dgud/test-fixes'
* dgud/test-fixes:
test: fix timetraps
kernel: Extend test timeout for cover tests
stdlib: Fix test timeouts in cover runs
runtime_tools: Fix failing testcase
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/interactive_shell_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl index 4787f19250..da57867a54 100644 --- a/lib/kernel/test/interactive_shell_SUITE.erl +++ b/lib/kernel/test/interactive_shell_SUITE.erl @@ -29,7 +29,7 @@ -export([toerl_server/3]). init_per_testcase(_Func, Config) -> - Dog = test_server:timetrap(test_server:seconds(60)), + Dog = test_server:timetrap(test_server:minutes(3)), Term = case os:getenv("TERM") of List when is_list(List) -> List; |