diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2014-07-15 08:20:29 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2014-07-15 08:20:29 -0400 |
| commit | dcfa6daf30cbd7bd1e570636d1ec76fda799eb26 (patch) | |
| tree | b1e3c26adaf9b095499ba21c781ad7b911620f4d /src | |
| parent | 0d1ae7a4683b1e4a305eb848e70ec641984a1067 (diff) | |
| parent | 35ee4571760ec7bd3bad9741d982699798bee1dc (diff) | |
Merge branch 'erl-args-to-end' of https://github.com/NineFX/rebar into NineFX-erl-args-to-end
Conflicts:
THANKS
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_ct.erl | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index c075e8c..6bccb82 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -217,15 +217,13 @@ make_cmd(TestDir, RawLogDir, Config) -> " ~s" " ~s" " -logdir \"~s\"" - " -env TEST_DIR \"~s\"" - " ~s", + " -env TEST_DIR \"~s\"", [BaseCmd, CodePathString, Include, build_name(Config), LogDir, - filename:join(Cwd, TestDir), - get_extra_params(Config)]) ++ + filename:join(Cwd, TestDir)]) ++ get_cover_config(Config, Cwd) ++ get_ct_config_file(TestDir) ++ get_config_file(TestDir) ++ @@ -237,19 +235,18 @@ make_cmd(TestDir, RawLogDir, Config) -> " ~s" " ~s" " -logdir \"~s\"" - " -env TEST_DIR \"~s\"" - " ~s", + " -env TEST_DIR \"~s\"", [BaseCmd, CodePathString, Include, build_name(Config), LogDir, - filename:join(Cwd, TestDir), - get_extra_params(Config)]) ++ + filename:join(Cwd, TestDir)]) ++ 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 @@ -258,7 +255,12 @@ build_name(Config) -> end. get_extra_params(Config) -> - rebar_config:get_local(Config, ct_extra_params, ""). + case rebar_config:get_local(Config, ct_extra_params, undefined) of + undefined -> + ""; + Defined -> + " " ++ Defined + end. get_ct_specs(Config, Cwd) -> case collect_glob(Config, Cwd, ".*\.test\.spec\$") of |