aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/et/test/et_wx_SUITE.erl4
-rw-r--r--lib/odbc/test/odbc_connect_SUITE.erl22
-rw-r--r--lib/odbc/test/odbc_data_type_SUITE.erl5
-rw-r--r--lib/odbc/test/odbc_query_SUITE.erl18
-rw-r--r--lib/odbc/test/odbc_start_SUITE.erl6
-rw-r--r--lib/reltool/test/reltool_app_SUITE.erl3
-rw-r--r--lib/reltool/test/reltool_server_SUITE.erl4
-rw-r--r--lib/reltool/test/reltool_wx_SUITE.erl6
-rw-r--r--lib/wx/test/wx_app_SUITE.erl3
-rw-r--r--lib/wx/test/wx_basic_SUITE.erl6
-rw-r--r--lib/wx/test/wx_class_SUITE.erl4
-rw-r--r--lib/wx/test/wx_event_SUITE.erl6
-rw-r--r--lib/wx/test/wx_opengl_SUITE.erl4
-rw-r--r--lib/wx/test/wx_xtra_SUITE.erl4
14 files changed, 31 insertions, 64 deletions
diff --git a/lib/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl
index 1a16ca69a3..05e5187d82 100644
--- a/lib/et/test/et_wx_SUITE.erl
+++ b/lib/et/test/et_wx_SUITE.erl
@@ -18,7 +18,7 @@
-module(et_wx_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -40,8 +40,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
et_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
start_all_windows
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 4d37a8f543..093b675fd5 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -40,20 +40,18 @@
%% Description: Returns documentation/test cases in this test suite
%% or a skip tuple if the platform is not supported.
%%--------------------------------------------------------------------
-all(doc) ->
- ["Tests the ability to connect and disconnet to/from the database"];
+
all(suite) ->
case odbc_test_lib:odbc_check() of
- ok -> all();
- Other -> {skip, Other}
- end.
-
-all() ->
- [not_exist_db, commit, rollback, not_explicit_commit,
- no_c_node, port_dies, control_process_dies, client_dies,
- connect_timeout, timeout, many_timeouts, timeout_reset,
- disconnect_on_timeout, connection_closed,
- disable_scrollable_cursors, return_rows_as_lists, api_missuse].
+ ok ->
+ [not_exist_db, commit, rollback, not_explicit_commit,
+ no_c_node, port_dies, control_process_dies, client_dies,
+ connect_timeout, timeout, many_timeouts, timeout_reset,
+ disconnect_on_timeout, connection_closed,
+ disable_scrollable_cursors, return_rows_as_lists, api_missuse];
+ Other ->
+ {skip, Other}
+ end.
%%--------------------------------------------------------------------
%% Function: init_per_suite(Config) -> Config
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 7d4a0ca15f..f0e35edbb2 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -43,13 +43,10 @@ all(doc) ->
["Tests data types"];
all(suite) ->
case odbc_test_lib:odbc_check() of
- ok -> all();
+ ok -> [char, int, floats, dec_and_num, timestamp];
Other -> {skip,Other}
end.
-all() ->
- [char, int, floats, dec_and_num, timestamp].
-
%%--------------------------------------------------------------------
%% Function: init_per_suite(Config) -> Config
%% Config - [tuple()]
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 12b39be3b7..25f4c837fa 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -42,19 +42,17 @@ all(doc) ->
["Tests SQL queries"];
all(suite) ->
case odbc_test_lib:odbc_check() of
- ok -> all();
+ ok ->
+ [sql_query, first, last, next, prev, select_count,select_next,
+ select_relative, select_absolute, create_table_twice,
+ delete_table_twice, duplicate_key, not_connection_owner,
+ no_result_set, query_error, multiple_select_result_sets,
+ multiple_mix_result_sets, multiple_result_sets_error,
+ parameterized_queries, describe_table,
+ delete_nonexisting_row];
Other -> {skip, Other}
end.
-all() ->
- [sql_query, first, last, next, prev, select_count,select_next,
- select_relative, select_absolute, create_table_twice,
- delete_table_twice, duplicate_key, not_connection_owner,
- no_result_set, query_error, multiple_select_result_sets,
- multiple_mix_result_sets, multiple_result_sets_error,
- parameterized_queries, describe_table,
- delete_nonexisting_row].
-
%%--------------------------------------------------------------------
%% Function: init_per_suite(Config) -> Config
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 2cca8e4546..07cda38c04 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -103,14 +103,10 @@ all(doc) ->
all(suite) ->
case odbc_test_lib:odbc_check() of
- ok -> all();
+ ok -> [start];
Other -> {skip, Other}
end.
-all() ->
- [start].
-
-
%% Test cases starts here.
%%--------------------------------------------------------------------
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl
index f8433f73d0..656a5faa29 100644
--- a/lib/reltool/test/reltool_app_SUITE.erl
+++ b/lib/reltool/test/reltool_app_SUITE.erl
@@ -63,9 +63,6 @@ fin_per_testcase(Case, Config) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-all() ->
- all(suite).
-
all(suite) ->
[
fields,
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index faf1bdbba2..0fb15239a2 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -18,7 +18,7 @@
-module(reltool_server_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -48,8 +48,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
start_server,
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index 2e2b355e07..2a951d0e9e 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2010. 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
@@ -18,7 +18,7 @@
-module(reltool_wx_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -40,8 +40,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
reltool_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
start_all_windows
diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl
index 8fff324913..cba7800f14 100644
--- a/lib/wx/test/wx_app_SUITE.erl
+++ b/lib/wx/test/wx_app_SUITE.erl
@@ -50,9 +50,6 @@ fin_per_testcase(Case, Config) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-all() ->
- all(suite).
-
all(suite) ->
[
fields,
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 599aa371ba..16fcac66d2 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -23,7 +23,7 @@
%%% Created : 3 Nov 2008 by Dan Gudmundsson <[email protected]>
%%%-------------------------------------------------------------------
-module(wx_basic_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -45,8 +45,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
wx_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
create_window,
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 7b8d510d40..9d9e001d3d 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -24,7 +24,7 @@
%%%-------------------------------------------------------------------
-module(wx_class_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -46,8 +46,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
wx_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
calendarCtrl,
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index dea10d892e..5204acb978 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -22,7 +22,7 @@
%%% Created : 3 Nov 2008 by Dan Gudmundsson <[email protected]>
%%%-------------------------------------------------------------------
-module(wx_event_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -44,8 +44,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
wx_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
connect,
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl
index 778d089bce..51c7064e7c 100644
--- a/lib/wx/test/wx_opengl_SUITE.erl
+++ b/lib/wx/test/wx_opengl_SUITE.erl
@@ -22,7 +22,7 @@
%%% Created : 3 Nov 2008 by Dan Gudmundsson <[email protected]>
%%%-------------------------------------------------------------------
-module(wx_opengl_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -52,8 +52,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
wx_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
canvas,
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index d5888bbf94..bf0a467eac 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -23,7 +23,7 @@
%%% Created : 3 Nov 2008 by Dan Gudmundsson <[email protected]>
%%%-------------------------------------------------------------------
-module(wx_xtra_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1,
+-export([all/1, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
@@ -45,8 +45,6 @@ fin_per_testcase(Func,Config) -> %% For test_server
wx_test_lib:end_per_testcase(Func,Config).
%% SUITE specification
-all() ->
- all(suite).
all(suite) ->
[
destroy_app,