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/wxt.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/wxt.erl')
| -rw-r--r-- | lib/wx/test/wxt.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl index fc828e47e8..265cd5c981 100644 --- a/lib/wx/test/wxt.erl +++ b/lib/wx/test/wxt.erl @@ -16,13 +16,9 @@ %% limitations under the License. %% %% %CopyrightEnd% -%%%------------------------------------------------------------------- -%%% File : wxt.erl -%%% Author : Dan Gudmundsson <[email protected]> -%%% Description : Shortcuts for starting test with wx internal test_server -%%% -%%% Created : 4 Nov 2008 by Dan Gudmundsson <[email protected]> -%%%------------------------------------------------------------------- +%% +%% Description : Shortcuts for running tests with wx internal test_server +%%------------------------------------------------------------------- -module(wxt). -compile(export_all). @@ -40,7 +36,7 @@ t(Mod, TC) when is_atom(Mod), is_atom(TC) -> t({Mod,TC}, []); t(all, Config) when is_list(Config) -> Fs = filelib:wildcard("wx_*_SUITE.erl"), - t([list_to_atom(filename:rootname(File)) || File <- Fs], Config); + t([list_to_atom(filename:rootname(File)) || File <- Fs, File =/= "wx_app_SUITE.erl"], Config); t(Test,Config) when is_list(Config) -> Tests = resolve(Test), write_test_case(Test), |