diff options
| author | Dan Gudmundsson <[email protected]> | 2013-03-26 11:30:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-03-26 11:30:02 +0100 |
| commit | 61613acb659553004538ad13ded3d6bf343bf6a7 (patch) | |
| tree | 7f612de6f889f19b483e8be4d18455826476977f /lib/wx | |
| parent | b2ad2c6e0261a410b53e5be8f1ae38a12408aa8f (diff) | |
| parent | 7e884c7d51bc8b0e03673998b242dc6edee3a28e (diff) | |
| download | otp-61613acb659553004538ad13ded3d6bf343bf6a7.tar.gz otp-61613acb659553004538ad13ded3d6bf343bf6a7.tar.bz2 otp-61613acb659553004538ad13ded3d6bf343bf6a7.zip | |
Merge branch 'dgud/testcase_fixes' into maint
* dgud/testcase_fixes:
Fix timers
mnesia: Decrease test times
Add debug printouts
wx: Fix failing testcases
stdlib: Ignore symlink tests on windows
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/test/wx_basic_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl index cf17818a9d..d55a037599 100644 --- a/lib/wx/test/wx_basic_SUITE.erl +++ b/lib/wx/test/wx_basic_SUITE.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. 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 @@ -100,6 +100,7 @@ several_apps(Config) -> || N <- lists:seq(1,4)], process_flag(trap_exit,true), ?m_multi_receive([{complete,Pid} || Pid <- Pids]), + [Pid ! quit || Pid <- Pids], case wx_test_lib:user_available(Config) of true -> receive {'EXIT',_,foo} -> ok end; @@ -118,6 +119,7 @@ several_apps(Parent, N, Config) -> #wx{obj=Frame, event=#wxSize{}} -> Parent ! {complete, self()} end, + receive quit -> ok end, wx_test_lib:wx_destroy(Frame, Config), exit(foo). diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 4186d73c88..7c3eda0be1 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -140,7 +140,7 @@ treeCtrl(Config) -> ?m({true, {_,Y1,_,_}} when Y1 > Y0, wxTreeCtrl:getBoundingRect(Tree, Item2)), ?m({Item1, _}, wxTreeCtrl:hitTest(Tree, {X0+W0 div 2, Y0+H0 div 2})), ?m(true, wxTreeCtrl:isTreeItemIdOk(Item1)), - ?m({0, _}, wxTreeCtrl:hitTest(Tree, {X0+W0 div 2, Y0+H0+H0})), + ?m({0, _}, wxTreeCtrl:hitTest(Tree, {X0+W0+W0, Y0+H0+4*H0})), ?m(false, wxTreeCtrl:isTreeItemIdOk(0)), wxFrame:connect(Tree, command_tree_item_expanded), |