From 5fa6671511aac8b662c6a8560924de4fe16f9b42 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Tue, 14 Jan 2014 12:38:33 +0100 Subject: Remove experimental flags Remove experimental flag from: * qc compile_only=true * eunit compile_only=true * src/foo.app.src.script * eunit tests= --- dialyzer_reference | 2 +- src/rebar_app_utils.erl | 9 --------- src/rebar_eunit.erl | 5 ++--- src/rebar_qc.erl | 3 +-- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dialyzer_reference b/dialyzer_reference index e26d8dd..558a7bb 100644 --- a/dialyzer_reference +++ b/dialyzer_reference @@ -1,3 +1,3 @@ -rebar_eunit.erl:388: Call to missing or unexported function eunit_test:function_wrapper/2 +rebar_eunit.erl:387: Call to missing or unexported function eunit_test:function_wrapper/2 rebar_utils.erl:163: Call to missing or unexported function escript:foldl/3 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 6ea28f7..5d90142 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 @@ -260,7 +259,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 53a6f52..ef123b4 100644 --- a/src/rebar_qc.erl +++ b/src/rebar_qc.erl @@ -142,8 +142,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. -- cgit v1.1