diff options
| author | Dan Gudmundsson <[email protected]> | 2016-04-22 09:14:44 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-04-22 09:14:44 +0200 |
| commit | e0a67398ad3d034e1afe59585a5f82af6981c1eb (patch) | |
| tree | d30cbe869fd90d312857f44cafd39301c79e867f /lib/wx/test/wx_app_SUITE.erl | |
| parent | 9bff4dbbaf44ff563b3d67c65061f5f0a7d7f944 (diff) | |
| parent | eeb1a534c7be3648d74f490a3daaccb6bbe8545a (diff) | |
| download | otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.tar.gz otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.tar.bz2 otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.zip | |
Merge branch 'dgud/wx/show_modal_callback_hangs/OTP-13491'
* dgud/wx/show_modal_callback_hangs/OTP-13491:
wx test: Setup timetraps
wx: Fix callback problems
Diffstat (limited to 'lib/wx/test/wx_app_SUITE.erl')
| -rw-r--r-- | lib/wx/test/wx_app_SUITE.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl index 0b885a78b8..3fd5bf689d 100644 --- a/lib/wx/test/wx_app_SUITE.erl +++ b/lib/wx/test/wx_app_SUITE.erl @@ -49,7 +49,7 @@ end_per_testcase(Func,Config) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> [{ct_hooks,[ts_install_cth]}, {timetrap,{minutes,5}}]. all() -> [fields, modules, exportall, app_depend, undef_funcs, appup]. @@ -221,12 +221,10 @@ check_apps([App|Apps]) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -undef_funcs(suite) -> - []; -undef_funcs(doc) -> - []; +undef_funcs() -> + [{timetrap,{minutes,10}}]. + undef_funcs(Config) when is_list(Config) -> - catch test_server:timetrap(timer:minutes(10)), App = wx, AppFile = key1search(app_file, Config), Mods = key1search(modules, AppFile), |