diff options
| author | Micael Karlberg <[email protected]> | 2011-04-18 15:14:36 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-18 15:14:36 +0200 |
| commit | 5af51d9dcb60487e4fcc87353fe0e150c0ba9eed (patch) | |
| tree | 95eb7adb0edba96eb3fc362a519fb1508cb477ec /lib/reltool/test/reltool_app_SUITE.erl | |
| parent | d621b2cdd09adcc38bd6d482ae6c4f87e22cb1e8 (diff) | |
| parent | 23906a01725f4494b8816c242926d08aeca0ef67 (diff) | |
| download | otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.tar.gz otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.tar.bz2 otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.zip | |
Merge branch 'dev' into bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119
Diffstat (limited to 'lib/reltool/test/reltool_app_SUITE.erl')
| -rw-r--r-- | lib/reltool/test/reltool_app_SUITE.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl index 537a06315a..a6e00cde08 100644 --- a/lib/reltool/test/reltool_app_SUITE.erl +++ b/lib/reltool/test/reltool_app_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010. All Rights Reserved. +%% Copyright Ericsson AB 2010-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -45,15 +45,16 @@ init_per_suite(Config) -> end_per_suite(Config) -> reltool_test_lib:end_per_suite(Config). +init_per_testcase(undef_funcs=Case, Config) -> + case test_server:is_debug() of + true -> + {skip,"Debug-compiled emulator -- far too slow"}; + false -> + Config2 = [{tc_timeout, timer:minutes(10)} | Config], + reltool_test_lib:init_per_testcase(Case, Config2) + end; init_per_testcase(Case, Config) -> - Config2 = - case Case of - undef_funcs -> - [{tc_timeout, timer:minutes(10)} | Config]; - _ -> - Config - end, - reltool_test_lib:init_per_testcase(Case, Config2). + reltool_test_lib:init_per_testcase(Case, Config). end_per_testcase(Func,Config) -> reltool_test_lib:end_per_testcase(Func,Config). |