aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/test/wx_basic_SUITE.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-03-26 11:32:08 +0100
committerDan Gudmundsson <[email protected]>2013-03-26 11:32:08 +0100
commit618d8907ece11d07aae5f80126ef20a6d00a9fa7 (patch)
treee3a11aca279e5ba37a9224e7fa2ca4e850dc1b21 /lib/wx/test/wx_basic_SUITE.erl
parent08037cc37e1bc116c44ee7665f7316b6d0dfecba (diff)
parent61613acb659553004538ad13ded3d6bf343bf6a7 (diff)
downloadotp-618d8907ece11d07aae5f80126ef20a6d00a9fa7.tar.gz
otp-618d8907ece11d07aae5f80126ef20a6d00a9fa7.tar.bz2
otp-618d8907ece11d07aae5f80126ef20a6d00a9fa7.zip
Merge branch 'maint'
Diffstat (limited to 'lib/wx/test/wx_basic_SUITE.erl')
-rw-r--r--lib/wx/test/wx_basic_SUITE.erl4
1 files changed, 3 insertions, 1 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).