summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Morrow <jared@basho.com>2014-01-16 15:09:50 -0800
committerJared Morrow <jared@basho.com>2014-01-16 15:09:50 -0800
commitb2c2adb7c0d016d5b5676b691335bf67d3952e2b (patch)
tree9c40072bbeb4b3b9a29ad85fdd8b8a0a748411a6 /src
parentc5e48b4a8bdd4f0b914809e46ab85cfe83217c43 (diff)
parent5fa6671511aac8b662c6a8560924de4fe16f9b42 (diff)
Merge pull request #215 from tuncer/experimental
Remove experimental flags
Diffstat (limited to 'src')
-rw-r--r--src/rebar_app_utils.erl9
-rw-r--r--src/rebar_eunit.erl5
-rw-r--r--src/rebar_qc.erl3
3 files changed, 3 insertions, 14 deletions
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 8158eb6..a2484e1 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -163,15 +163,6 @@ consult_app_file(Filename) ->
false ->
file:consult(Filename);
true ->
- %% TODO: EXPERIMENTAL For now let's warn the user if a
- %% script is going to be run.
- case filelib:is_regular([Filename, ".script"]) of
- true ->
- ?CONSOLE("NOTICE: Using experimental *.app.src.script "
- "functionality on ~s ~n", [Filename]);
- _ ->
- ok
- end,
rebar_config:consult_file(Filename)
end.
diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index 2dc4505..0219d96 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -84,8 +84,7 @@ eunit(Config, _AppFile) ->
ok = ensure_dirs(),
%% Save code path
CodePath = setup_code_path(),
- CompileOnly = rebar_utils:get_experimental_global(Config, compile_only,
- false),
+ CompileOnly = rebar_config:get_global(Config, compile_only, false),
{ok, SrcErls} = rebar_erlc_compiler:test_compile(Config, "eunit",
?EUNIT_DIR),
case CompileOnly of
@@ -261,7 +260,7 @@ get_tests(Config, SuitesProvided, ModuleBeamFiles, FilteredModules) ->
get_matching_tests(Config, Modules).
get_matching_tests(Config, Modules) ->
- RawFunctions = rebar_utils:get_experimental_global(Config, tests, ""),
+ RawFunctions = rebar_config:get_global(Config, tests, ""),
Tests = [list_to_atom(F1) || F1 <- string:tokens(RawFunctions, ",")],
case Tests of
[] ->
diff --git a/src/rebar_qc.erl b/src/rebar_qc.erl
index 872b15d..99d37a2 100644
--- a/src/rebar_qc.erl
+++ b/src/rebar_qc.erl
@@ -144,8 +144,7 @@ run(Config, QC, QCOpts) ->
ok = ensure_dirs(),
CodePath = setup_codepath(),
- CompileOnly = rebar_utils:get_experimental_global(Config, compile_only,
- false),
+ CompileOnly = rebar_config:get_global(Config, compile_only, false),
%% Compile erlang code to ?QC_DIR, using a tweaked config
%% with appropriate defines, and include all the test modules
%% as well.