diff options
| author | Dan Gudmundsson <[email protected]> | 2011-12-02 16:26:45 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-12-06 10:13:49 +0100 |
| commit | 8b6f6db0f5faddc970a7867aecdb03f3cde5fa78 (patch) | |
| tree | 9a1798efd7150d9f416d2d32180dc4be5cac3732 /lib/wx/test/wx_test_lib.hrl | |
| parent | 50b488753358d38348f2d4051bfcea8d860e739b (diff) | |
| download | otp-8b6f6db0f5faddc970a7867aecdb03f3cde5fa78.tar.gz otp-8b6f6db0f5faddc970a7867aecdb03f3cde5fa78.tar.bz2 otp-8b6f6db0f5faddc970a7867aecdb03f3cde5fa78.zip | |
[wx] Avoid deadlock in handle_sync_event
Avoid sending cb messages to the wx_object, since it may deadlock.
Instead send it to the wxe_server which reads the state from the wx_object's
process_dictionary.
Ugly but it's the only way I can avoid the deadlock.
Diffstat (limited to 'lib/wx/test/wx_test_lib.hrl')
| -rw-r--r-- | lib/wx/test/wx_test_lib.hrl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/wx/test/wx_test_lib.hrl b/lib/wx/test/wx_test_lib.hrl index 34e1e9c6b8..820e8f0050 100644 --- a/lib/wx/test/wx_test_lib.hrl +++ b/lib/wx/test/wx_test_lib.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -40,7 +40,6 @@ -define(m(ExpectedRes, Expr), fun() -> - {TeStFILe, TeSTLiNe} = {?FILE, ?LINE}, AcTuAlReS = (catch (Expr)), case AcTuAlReS of ExpectedRes -> @@ -48,8 +47,8 @@ AcTuAlReS; _ -> wx_test_lib:error("Not Matching Actual result was:~n ~p ~n Expected ~s~n", - [AcTuAlReS, ??ExpectedRes], - TeStFILe,TeSTLiNe), + [AcTuAlReS, ??ExpectedRes], + ?FILE,?LINE), AcTuAlReS end end()). |