diff options
| author | Dan Gudmundsson <[email protected]> | 2015-08-26 12:58:17 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-08-26 12:58:17 +0200 |
| commit | ab9015609f4cf28ab4ce3808fe85c90f1ba4af21 (patch) | |
| tree | ed48f1750ae8e604d6dff68c0ca22ef3eed72d71 /lib | |
| parent | 5a8f1cb18b6dce3d489b4b77c5e7c82de716ae67 (diff) | |
| parent | c1d03aff7cb03ce6b430dfb9916df2c02940ab9b (diff) | |
| download | otp-ab9015609f4cf28ab4ce3808fe85c90f1ba4af21.tar.gz otp-ab9015609f4cf28ab4ce3808fe85c90f1ba4af21.tar.bz2 otp-ab9015609f4cf28ab4ce3808fe85c90f1ba4af21.zip | |
Merge branch 'dgud/wx/fix-test' into maint
* dgud/wx/fix-test:
wx: Fix assert log test
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 465299a649..93a4c24a84 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -387,9 +387,18 @@ listCtrlSort(Config) -> Item = wxListItem:new(), - %% Force an assert on (and debug compiled) which 3.0 is by default + %% Test that wx-asserts are sent to error logger + %% Force an assert on 3.0 (when debug compiled which it is by default) wxListItem:setId(Item, 200), - io:format("Got ~p ~n", [wxListCtrl:getItem(LC, Item)]), + case os:type() of + {win32, _} -> + wxListItem:setColumn(Item, 3), + io:format("Got ~p ~n", [wxListCtrl:insertItem(LC, Item)]), + wxListItem:setColumn(Item, 0); + _ -> %% Uses generic listctrl + %% we can't use the code above on linux with wx-2.8.8 because it segfaults. + io:format("Got ~p ~n", [wxListCtrl:getItem(LC, Item)]) + end, wxListItem:setMask(Item, ?wxLIST_MASK_TEXT), _List = wx:map(fun(Int) -> |