summaryrefslogtreecommitdiff
path: root/src/rebar3.erl
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2017-08-13 15:44:01 -0400
committerGitHub <noreply@github.com>2017-08-13 15:44:01 -0400
commit9c4e40d5b93c83f853be84685242d264b0892115 (patch)
treecdf2d2d1962d36deb1c5531b6575eca4dff64bf9 /src/rebar3.erl
parentd9064768e842d0d685287755bc2b31b223488923 (diff)
parentbed661aef80d113ae04e8e9da035f904b7c4aec4 (diff)
Merge pull request #1606 from ferd/recurive-profile-merge
Fix recursive profile merging, particularly for umbrella apps
Diffstat (limited to 'src/rebar3.erl')
-rw-r--r--src/rebar3.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl
index eec8968..2b24bca 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -396,8 +396,8 @@ safe_define_test_macro(Opts) ->
%% defining a compile macro twice results in an exception so
%% make sure 'TEST' is only defined once
case test_defined(Opts) of
- true -> [];
- false -> [{d, 'TEST'}]
+ true -> Opts;
+ false -> [{d, 'TEST'}|Opts]
end.
test_defined([{d, 'TEST'}|_]) -> true;