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/asn1 | |
| 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/asn1')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index b0c37d79e7..501157b9b4 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -1,3 +1,4 @@ +%% %% %CopyrightBegin% %% %% Copyright Ericsson AB 2001-2012. All Rights Reserved. @@ -242,8 +243,8 @@ init_per_testcase(Func, Config) -> true = code:add_patha(CaseDir), Dog = case Func of - testX420 -> test_server:timetrap({minutes, 90}); - _ -> test_server:timetrap({minutes, 60}) + testX420 -> ct:timetrap({minutes, 90}); + _ -> ct:timetrap({minutes, 60}) end, [{case_dir, CaseDir}, {watchdog, Dog}|Config]. |