Browse Source

Deprecate ct suite= option for suites= option

pull/3/head
Magnus Klaar 13 years ago
committed by Tuncer Ayaz
parent
commit
4db90bafef
3 changed files with 19 additions and 14 deletions
  1. +1
    -1
      priv/shell-completion/bash/rebar
  2. +1
    -1
      src/rebar.erl
  3. +17
    -12
      src/rebar_ct.erl

+ 1
- 1
priv/shell-completion/bash/rebar View File

@ -11,7 +11,7 @@ _rebar()
cmdsnvars="check-deps clean compile create create-app create-node \
ct doc delete-deps eunit get-deps generate generate-upgrade \
help list-deps list-templates update-deps version xref overlay \
apps= case= force=1 jobs= suite= verbose=1 appid= previous_release= \
apps= case= force=1 jobs= suites= verbose=1 appid= previous_release= \
root_dir= skip_deps=true skip_apps= template= template_dir="
if [[ ${cur} == --* ]] ; then

+ 1
- 1
src/rebar.erl View File

@ -259,7 +259,7 @@ generate-upgrade previous_release=path Build an upgrade package
generate-appups previous_release=path Generate appup files
eunit [suite=foo] Run eunit [test/foo_tests.erl] tests
ct [suite=] [case=] Run common_test suites in ./test
ct [suites=] [case=] Run common_test suites in ./test
xref Run cross reference analysis

+ 17
- 12
src/rebar_ct.erl View File

@ -32,7 +32,7 @@
%%
%% Global options:
%% verbose=1 - show output from the common_test run as it goes
%% suite="foo"" - runs <test>/foo_SUITE
%% suites="foo,bar" - runs <test>/foo_SUITE and <test>/bar_SUITE
%% case="mycase" - runs individual test case foo_SUITE:mycase
%% -------------------------------------------------------------------
-module(rebar_ct).
@ -106,7 +106,7 @@ check_log(RawLog) ->
?FAIL;
true ->
?CONSOLE("DONE. ~s\n", [Msg])
?CONSOLE("DONE. class="se">\n~s\n", [Msg])
end.
%% Show the log if it hasn't already been shown because verbose was on
@ -243,18 +243,23 @@ get_config_file(TestDir) ->
end.
get_suite(TestDir) ->
case rebar_config:get_global(suite, undefined) of
case rebar_utils:get_deprecated_global(suite, suites, "soon") of
undefined ->
" -dir " ++ TestDir;
Suite ->
Filename = filename:join(TestDir, Suite ++ "_SUITE.erl"),
case filelib:is_regular(Filename) of
false ->
?ERROR("Suite ~s not found\n", [Suite]),
?FAIL;
true ->
" -suite " ++ Filename
end
Suites ->
Suites1 = string:tokens(Suites, ","),
Suites2 = [find_suite_path(Suite, TestDir) || Suite <- Suites1],
string:join([" -suite"] ++ Suites2, " ")
end.
find_suite_path(Suite, TestDir) ->
Path = filename:join(TestDir, Suite ++ "_SUITE.erl"),
case filelib:is_regular(Path) of
false ->
?ERROR("Suite ~s not found\n", [Suite]),
?FAIL;
true ->
Path
end.
get_case() ->

Loading…
Cancel
Save