You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/06/01 22:42:26 UTC
[32/50] rebar commit: updated refs/heads/import to e9f62c4
Merge branch 'erl-args-to-end' of https://github.com/NineFX/rebar into NineFX-erl-args-to-end
Conflicts:
THANKS
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/dcfa6daf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/dcfa6daf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/dcfa6daf
Branch: refs/heads/import
Commit: dcfa6daf30cbd7bd1e570636d1ec76fda799eb26
Parents: 0d1ae7a 35ee457
Author: Fred Hebert <mo...@ferd.ca>
Authored: Tue Jul 15 08:20:29 2014 -0400
Committer: Fred Hebert <mo...@ferd.ca>
Committed: Tue Jul 15 08:20:29 2014 -0400
----------------------------------------------------------------------
THANKS | 1 +
inttest/ct1/app.config | 2 ++
inttest/ct1/ct1_rt.erl | 2 ++
inttest/ct1/rebar.config | 1 +
inttest/ct1/test_SUITE.erl | 8 +++++++-
src/rebar_ct.erl | 22 ++++++++++++----------
6 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/dcfa6daf/THANKS
----------------------------------------------------------------------
diff --cc THANKS
index ef359ac,6bf2ea0..3db3b4c
--- a/THANKS
+++ b/THANKS
@@@ -120,9 -120,4 +120,10 @@@ Pedram Nimreez
Sylvain Benner
Oliver Ferrigni
Dave Thomas
+Evgeniy Khramtsov
+YeJun Su
+Yuki Ito
+alisdair sullivan
+Alexander Verbitsky
+Andras Horvath
+ Drew Varner
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/dcfa6daf/src/rebar_ct.erl
----------------------------------------------------------------------
diff --cc src/rebar_ct.erl
index c075e8c,c2b54a1..6bccb82
--- a/src/rebar_ct.erl
+++ b/src/rebar_ct.erl
@@@ -258,10 -255,15 +255,15 @@@ 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(Cwd) ->
- case collect_glob(Cwd, ".*\.test\.spec\$") of
+get_ct_specs(Config, Cwd) ->
+ case collect_glob(Config, Cwd, ".*\.test\.spec\$") of
[] -> undefined;
[Spec] ->
" -spec " ++ Spec;