From fe9d328cb5133ee91dd3bbd45849e0772bf197c5 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Wed, 5 Mar 2014 19:45:22 +0100 Subject: [PATCH 1/2] erlc: fixup log message Using the filename as a prefix is less readable and inconsistent with the other log messages. Before: DEBUG: src/foo.erl depends on... After: DEBUG: Dependencies of src/foo.erl ... --- src/rebar_erlc_compiler.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl index 75d47fb..473a8aa 100644 --- a/src/rebar_erlc_compiler.erl +++ b/src/rebar_erlc_compiler.erl @@ -538,7 +538,7 @@ internal_erl_compile(Config, Source, OutDir, ErlOpts, G) -> %% Determine the target name and includes list by inspecting the source file Module = filename:basename(Source, ".erl"), Parents = get_parents(G, Source), - log_files(?FMT("~s depends on", [Source]), Parents), + log_files(?FMT("Dependencies of ~s", [Source]), Parents), %% Construct the target filename Target = filename:join([OutDir | string:tokens(Module, ".")]) ++ ".beam", From b2dfebab15cc92b337b9cc9e771cb7de3ed61e4a Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Wed, 5 Mar 2014 17:59:35 +0100 Subject: [PATCH 2/2] erlc: add test suite --- inttest/erlc/asn1/SIMPLE-ASN.asn1 | 7 ++ inttest/erlc/erlc_rt.erl | 98 +++++++++++++++++++++++ inttest/erlc/extra-include/foo_extra.hrl | 1 + inttest/erlc/extra-src/foo_sup.erl | 13 +++ inttest/erlc/include/foo_core.hrl | 1 + inttest/erlc/mibs/SIMPLE-MIB.mib | 26 ++++++ inttest/erlc/rebar-no_debug_info.config | 11 +++ inttest/erlc/rebar.config | 10 +++ inttest/erlc/src/behaviour/foo_worker.erl | 14 ++++ inttest/erlc/src/first_xrl.xrl | 13 +++ inttest/erlc/src/first_yrl.yrl | 9 +++ inttest/erlc/src/foo.erl | 35 ++++++++ inttest/erlc/src/foo_app.erl | 10 +++ inttest/erlc/src/foo_test_worker.erl | 34 ++++++++ 14 files changed, 282 insertions(+) create mode 100644 inttest/erlc/asn1/SIMPLE-ASN.asn1 create mode 100644 inttest/erlc/erlc_rt.erl create mode 100644 inttest/erlc/extra-include/foo_extra.hrl create mode 100644 inttest/erlc/extra-src/foo_sup.erl create mode 100644 inttest/erlc/include/foo_core.hrl create mode 100644 inttest/erlc/mibs/SIMPLE-MIB.mib create mode 100644 inttest/erlc/rebar-no_debug_info.config create mode 100644 inttest/erlc/rebar.config create mode 100644 inttest/erlc/src/behaviour/foo_worker.erl create mode 100644 inttest/erlc/src/first_xrl.xrl create mode 100644 inttest/erlc/src/first_yrl.yrl create mode 100644 inttest/erlc/src/foo.erl create mode 100644 inttest/erlc/src/foo_app.erl create mode 100644 inttest/erlc/src/foo_test_worker.erl diff --git a/inttest/erlc/asn1/SIMPLE-ASN.asn1 b/inttest/erlc/asn1/SIMPLE-ASN.asn1 new file mode 100644 index 0000000..62f0860 --- /dev/null +++ b/inttest/erlc/asn1/SIMPLE-ASN.asn1 @@ -0,0 +1,7 @@ +SIMPLE-ASN DEFINITIONS ::= BEGIN + + SimpleMessage ::= SEQUENCE { + id INTEGER + } + +END diff --git a/inttest/erlc/erlc_rt.erl b/inttest/erlc/erlc_rt.erl new file mode 100644 index 0000000..354ad29 --- /dev/null +++ b/inttest/erlc/erlc_rt.erl @@ -0,0 +1,98 @@ +-module(erlc_rt). +-export([files/0, + run/1]). + +-include_lib("eunit/include/eunit.hrl"). + +-define(MODULES, + [first_xrl, + first_yrl, + foo, + foo_app, + foo_sup, + foo_test_worker, + foo_worker, + 'SIMPLE-ASN']). + +-define(BEAM_FILES, + ["first_xrl.beam", + "first_yrl.beam", + "foo.beam", + "foo_app.beam", + "foo_sup.beam", + "foo_test_worker.beam", + "foo_worker.beam", + "SIMPLE-ASN.beam"]). + +files() -> + [ + {copy, "../../rebar", "rebar"}, + {copy, "rebar.config", "rebar.config"}, + {copy, "rebar-no_debug_info.config", "rebar-no_debug_info.config"}, + {copy, "include", "include"}, + {copy, "extra-include", "extra-include"}, + {copy, "src", "src"}, + {copy, "extra-src", "extra-src"}, + {copy, "mibs", "mibs"}, + {copy, "asn1", "asn1"}, + {create, "ebin/foo.app", app(foo, ?MODULES)} + ]. + +run(_Dir) -> + ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), + ok = check_beams(true), + ok = check_debug_info(true), + MibResult = filename:join(["priv", "mibs", "SIMPLE-MIB.bin"]), + ?assertMatch(true, filelib:is_regular(MibResult)), + ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])), + ok = check_beams(false), + ?assertMatch(false, filelib:is_regular(MibResult)), + ?assertMatch( + {ok, _}, + retest_sh:run("./rebar -C rebar-no_debug_info.config compile", [])), + ok = check_beams(true), + ok = check_debug_info(false), + ?assertMatch(true, filelib:is_regular(MibResult)), + ok. + +check_beams(Exist) -> + check_files(Exist, fun filelib:is_regular/1). + +check_debug_info(HasDebugInfo) -> + check_files(HasDebugInfo, fun has_debug_info/1). + +check_files(Expected, Check) -> + lists:foreach( + fun(F) -> + File = filename:join("ebin", F), + ?assertEqual(Expected, Check(File)) + end, + ?BEAM_FILES). + +%% NOTE: Copied from dialyzer_utils:get_abstract_code_from_beam/1 and +%% modified for local use. We could have called the function directly, +%% but dialyzer_utils is not an official API to rely on. +has_debug_info(File) -> + case beam_lib:chunks(File, [abstract_code]) of + {ok, {_Mod, List}} -> + case lists:keyfind(abstract_code, 1, List) of + {abstract_code, {raw_abstract_v1, _Abstr}} -> + true; + _ -> + false + end; + _ -> + false + end. + +%% +%% Generate the contents of a simple .app file +%% +app(Name, Modules) -> + App = {application, Name, + [{description, atom_to_list(Name)}, + {vsn, "1"}, + {modules, Modules}, + {registered, []}, + {applications, [kernel, stdlib]}]}, + io_lib:format("~p.\n", [App]). diff --git a/inttest/erlc/extra-include/foo_extra.hrl b/inttest/erlc/extra-include/foo_extra.hrl new file mode 100644 index 0000000..228affa --- /dev/null +++ b/inttest/erlc/extra-include/foo_extra.hrl @@ -0,0 +1 @@ +-define(FOO_EXTRA, foo_extra). diff --git a/inttest/erlc/extra-src/foo_sup.erl b/inttest/erlc/extra-src/foo_sup.erl new file mode 100644 index 0000000..a0f06b6 --- /dev/null +++ b/inttest/erlc/extra-src/foo_sup.erl @@ -0,0 +1,13 @@ +-module(foo_sup). + +-behavior(supervisor). + +-export([start_link/0, + init/1]). + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +init(_Args) -> + FooChild = {foo,{foo, start_link, []}, permanent, 5000, worker, [foo]}, + {ok,{{one_for_all,1,1}, [FooChild]}}. diff --git a/inttest/erlc/include/foo_core.hrl b/inttest/erlc/include/foo_core.hrl new file mode 100644 index 0000000..2363140 --- /dev/null +++ b/inttest/erlc/include/foo_core.hrl @@ -0,0 +1 @@ +-define(FOO_CORE, foo_core). diff --git a/inttest/erlc/mibs/SIMPLE-MIB.mib b/inttest/erlc/mibs/SIMPLE-MIB.mib new file mode 100644 index 0000000..ca8735a --- /dev/null +++ b/inttest/erlc/mibs/SIMPLE-MIB.mib @@ -0,0 +1,26 @@ +-- SIMPLE-MIB. +-- This is just a simple MIB used for testing! +-- + + +SIMPLE-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, enterprises + FROM SNMPv2-SMI; + +ericsson MODULE-IDENTITY + LAST-UPDATED + "201403060000Z" + ORGANIZATION + "rebar" + CONTACT-INFO + "rebar + or + whoever is currently responsible for the SIMPLE + enterprise MIB tree branch (enterprises.999)." + DESCRIPTION + "This very small module is made available + for mib-compilation testing." + ::= { enterprises 999 } +END diff --git a/inttest/erlc/rebar-no_debug_info.config b/inttest/erlc/rebar-no_debug_info.config new file mode 100644 index 0000000..1a7113a --- /dev/null +++ b/inttest/erlc/rebar-no_debug_info.config @@ -0,0 +1,11 @@ +%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 ft=erlang et +{erl_first_files, ["first_xrl.erl", "first_yrl.erl"]}. + +{erl_opts, + [ + no_debug_info, + {i, "extra-include"}, + {src_dirs, ["src", "extra-src"]}, + {platform_define, "R13|R14", 'NO_CALLBACK_ATTRIBUTE'} + ]}. diff --git a/inttest/erlc/rebar.config b/inttest/erlc/rebar.config new file mode 100644 index 0000000..6a1082a --- /dev/null +++ b/inttest/erlc/rebar.config @@ -0,0 +1,10 @@ +%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 ft=erlang et +{erl_first_files, ["first_xrl.erl", "first_yrl.erl"]}. + +{erl_opts, + [ + {i, "extra-include"}, + {src_dirs, ["src", "extra-src"]}, + {platform_define, "R13|R14", 'NO_CALLBACK_ATTRIBUTE'} + ]}. diff --git a/inttest/erlc/src/behaviour/foo_worker.erl b/inttest/erlc/src/behaviour/foo_worker.erl new file mode 100644 index 0000000..307c69a --- /dev/null +++ b/inttest/erlc/src/behaviour/foo_worker.erl @@ -0,0 +1,14 @@ +-module(foo_worker). + +-ifdef(NO_CALLBACK_ATTRIBUTE). + +-export([behaviour_info/1]). + +behaviour_info(callbacks) -> [{status, 0}]; +behaviour_info(_) -> undefined. + +-else. + +-callback status() -> 'idle' | 'busy'. + +-endif. diff --git a/inttest/erlc/src/first_xrl.xrl b/inttest/erlc/src/first_xrl.xrl new file mode 100644 index 0000000..0de4c70 --- /dev/null +++ b/inttest/erlc/src/first_xrl.xrl @@ -0,0 +1,13 @@ +Definitions. + +D = [0-9] + +Rules. + +{D}+ : + {token,{integer,TokenLine,list_to_integer(TokenChars)}}. + +{D}+\.{D}+((E|e)(\+|\-)?{D}+)? : + {token,{float,TokenLine,list_to_float(TokenChars)}}. + +Erlang code. diff --git a/inttest/erlc/src/first_yrl.yrl b/inttest/erlc/src/first_yrl.yrl new file mode 100644 index 0000000..8ccdb0e --- /dev/null +++ b/inttest/erlc/src/first_yrl.yrl @@ -0,0 +1,9 @@ +Nonterminals list elements element. +Terminals atom '(' ')'. +Rootsymbol list. +list -> '(' ')'. +list -> '(' elements ')'. +elements -> element. +elements -> element elements. +element -> atom. +element -> list. diff --git a/inttest/erlc/src/foo.erl b/inttest/erlc/src/foo.erl new file mode 100644 index 0000000..33e6cfc --- /dev/null +++ b/inttest/erlc/src/foo.erl @@ -0,0 +1,35 @@ +-module(foo). + +-export([start_link/0, + start_link/1, + init/1, + terminate/2, + handle_info/2, + handle_call/3, + handle_cast/2, + code_change/3]). + +-behavior(gen_server). + +-include("foo_core.hrl"). +-include("foo_extra.hrl"). +-include_lib("kernel/include/file.hrl"). + +-record(state, {node :: node()}). + +start_link() -> start_link(undefined). + +start_link(Args) -> + gen_server:start_link({local, ?MODULE}, ?MODULE, Args, []). + +init(_Args) -> {ok, #state{node=node()}}. + +terminate(_Reason, _Data) -> ok. + +handle_info(_Info, State) -> {noreply, State}. + +handle_cast(_Msg, State) -> {noreply, State}. + +handle_call(_Msg, _From, State) -> {reply, ok, State}. + +code_change(_OldVsn, State, _Extra) -> {ok, State}. diff --git a/inttest/erlc/src/foo_app.erl b/inttest/erlc/src/foo_app.erl new file mode 100644 index 0000000..a3c7a96 --- /dev/null +++ b/inttest/erlc/src/foo_app.erl @@ -0,0 +1,10 @@ +-module(foo_app). + +-behaviour(application). + +-export([start/2, + stop/1]). + +start(_Type, _Args) -> foo_sup:start_link(). + +stop(_State) -> ok. diff --git a/inttest/erlc/src/foo_test_worker.erl b/inttest/erlc/src/foo_test_worker.erl new file mode 100644 index 0000000..96ae932 --- /dev/null +++ b/inttest/erlc/src/foo_test_worker.erl @@ -0,0 +1,34 @@ +-module(foo_test_worker). + +-behaviour(gen_server). +-behaviour(foo_worker). + +-export([start_link/0, + start_link/1, + init/1, + handle_call/3, + handle_cast/2, + handle_info/2, + terminate/2, + code_change/3, + status/0]). + +-include_lib("kernel/include/inet.hrl"). + +start_link() -> start_link(undefined). + +start_link(Args) -> gen_server:start_link(?MODULE, Args, []). + +init([]) -> {ok, undefined}. + +handle_call(_Event, _From, State) -> {reply, ok, State}. + +handle_cast(_Event, State) -> {noreply, State}. + +handle_info(_Info, State) -> {noreply, State}. + +terminate(_Reason, _State) -> ok. + +code_change(_OldVsn, State, _Extra) -> {ok, State}. + +status() -> busy.