diff options
| author | Magnus Klaar <magnus.klaar@gmail.com> | 2012-01-06 18:33:41 +0100 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2012-01-06 20:40:46 +0100 |
| commit | 4db90bafef5a7c3dab9a0cb35a3937e0021da959 (patch) | |
| tree | 2e12d5ed24685fcd08bbe0fea5372e377565714d /src | |
| parent | 1daa15293ab98ff8259acf0dbaf807487551c7f4 (diff) | |
Deprecate ct suite= option for suites= option
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar.erl | 2 | ||||
| -rw-r--r-- | src/rebar_ct.erl | 29 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/rebar.erl b/src/rebar.erl index ca646b1..5abf823 100644 --- a/src/rebar.erl +++ b/src/rebar.erl @@ -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 diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index 70524af..626144e 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -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.\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() -> |