From ae7a7aae18116eedd582662bf28644428f175029 Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Sun, 21 Dec 2014 15:25:00 -0500 Subject: [PATCH] Revert "Merge branch 'kittee-ct_appconfig_fix'" This reverts commit 3c0f420c2a547cdb4f49348f19421513cf3a250e, reversing changes made to 8f64e131846d53dbf8516f86270402465b7b37f8. --- THANKS | 1 - inttest/ct3/app.config | 2 -- inttest/ct3/converted/.keep | 0 inttest/ct3/ct3_rt.erl | 56 ----------------------------------- inttest/ct3/rebar.config | 2 -- inttest/ct3/test_SUITE.erl | 52 -------------------------------- inttest/ct3/unconverted/.keep | 0 src/rebar_ct.erl | 14 ++++----- 8 files changed, 6 insertions(+), 121 deletions(-) delete mode 100644 inttest/ct3/app.config delete mode 100644 inttest/ct3/converted/.keep delete mode 100644 inttest/ct3/ct3_rt.erl delete mode 100644 inttest/ct3/rebar.config delete mode 100644 inttest/ct3/test_SUITE.erl delete mode 100644 inttest/ct3/unconverted/.keep diff --git a/THANKS b/THANKS index d8c0b0d..5cf2e4b 100644 --- a/THANKS +++ b/THANKS @@ -131,4 +131,3 @@ Roberto Aloi Luis Rascao Vlad Dumitrescu stwind -Igor Savchuk diff --git a/inttest/ct3/app.config b/inttest/ct3/app.config deleted file mode 100644 index bb718b2..0000000 --- a/inttest/ct3/app.config +++ /dev/null @@ -1,2 +0,0 @@ -%% This file is an application config file, not a CT test config file -[{a1, [{foo, bar}]}]. diff --git a/inttest/ct3/converted/.keep b/inttest/ct3/converted/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/inttest/ct3/ct3_rt.erl b/inttest/ct3/ct3_rt.erl deleted file mode 100644 index 577b10c..0000000 --- a/inttest/ct3/ct3_rt.erl +++ /dev/null @@ -1,56 +0,0 @@ -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 et -%% ------------------------------------------------------------------- -%% -%% rebar: Erlang Build Tools -%% -%% Copyright (c) 2014 Savchuk Igor -%% -%% Permission is hereby granted, free of charge, to any person obtaining a copy -%% of this software and associated documentation files (the "Software"), to deal -%% in the Software without restriction, including without limitation the rights -%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -%% copies of the Software, and to permit persons to whom the Software is -%% furnished to do so, subject to the following conditions: -%% -%% The above copyright notice and this permission notice shall be included in -%% all copies or substantial portions of the Software. -%% -%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -%% THE SOFTWARE. -%% ------------------------------------------------------------------- --module(ct3_rt). - --compile(export_all). - - -files() -> - [{create, "ebin/a1.app", app(a1)}, - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "app.config", "itest/app.config"}, - {copy, "test_SUITE.erl", "itest/test_SUITE.erl"}, - {copy, "converted"}, - {copy, "unconverted"}]. - -run(_Dir) -> - {ok, _} = retest:sh("./rebar compile ct"), - {ok, _} = retest:sh("./rebar compile ct -v"), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, []}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/ct3/rebar.config b/inttest/ct3/rebar.config deleted file mode 100644 index 124c5f2..0000000 --- a/inttest/ct3/rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{ct_dir, "itest"}. -{ct_extra_params, "-repeat 2 -pa converted -erl_args -pa unconverted"}. diff --git a/inttest/ct3/test_SUITE.erl b/inttest/ct3/test_SUITE.erl deleted file mode 100644 index efd930d..0000000 --- a/inttest/ct3/test_SUITE.erl +++ /dev/null @@ -1,52 +0,0 @@ -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 et -%% ------------------------------------------------------------------- -%% -%% rebar: Erlang Build Tools -%% -%% Copyright (c) 2014 Savchuk Igor -%% -%% Permission is hereby granted, free of charge, to any person obtaining a copy -%% of this software and associated documentation files (the "Software"), to deal -%% in the Software without restriction, including without limitation the rights -%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -%% copies of the Software, and to permit persons to whom the Software is -%% furnished to do so, subject to the following conditions: -%% -%% The above copyright notice and this permission notice shall be included in -%% all copies or substantial portions of the Software. -%% -%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -%% THE SOFTWARE. -%% ------------------------------------------------------------------- --module(test_SUITE). - --compile(export_all). - --include_lib("ct.hrl"). - -all() -> - [simple_test, - app_config_file_test, - check_path]. - -simple_test(Config) -> - io:format("Test: ~p\n", [Config]). - -app_config_file_test(_Config) -> - application:start(a1), - {ok, bar} = application:get_env(a1, foo), - application:stop(a1). - -%% check if -erl_args in ct_extra_params of rebar.config is working -%% if it is, path before -erl_args is converted to absolute -%% and path after -erl_args is not -check_path(_Config) -> - Path = code:get_path(), - false = lists:member("converted", Path), - true = lists:member("unconverted", Path). diff --git a/inttest/ct3/unconverted/.keep b/inttest/ct3/unconverted/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index 152e28f..e24a3ce 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -226,10 +226,9 @@ make_cmd(TestDir, RawLogDir, Config) -> filename:join(Cwd, TestDir)]) ++ get_cover_config(Config, Cwd) ++ get_ct_config_file(TestDir) ++ + get_config_file(TestDir) ++ get_suites(Config, TestDir) ++ - get_case(Config) ++ - get_extra_params(Config) ++ - get_config_file(TestDir); + get_case(Config); SpecFlags -> ?FMT("~s" " -pa ~s" @@ -243,12 +242,11 @@ make_cmd(TestDir, RawLogDir, Config) -> build_name(Config), LogDir, filename:join(Cwd, TestDir)]) ++ - SpecFlags ++ - get_cover_config(Config, Cwd) ++ - get_extra_params(Config) + SpecFlags ++ get_cover_config(Config, Cwd) end, + Cmd1 = Cmd ++ get_extra_params(Config), RawLog = filename:join(LogDir, "raw.log"), - {Cmd, RawLog}. + {Cmd1, RawLog}. build_name(Config) -> case rebar_config:get_local(Config, ct_use_short_names, false) of @@ -328,7 +326,7 @@ get_config_file(TestDir) -> false -> " "; true -> - " -erl_args -config " ++ Config + " -config " ++ Config end. get_suites(Config, TestDir) ->