Merge pull request #2054 from tolbrino/fix-parallel-edoc-test

Fix duplicate module naming in edoc test suite data
erlang · Apr 18, 2019 · ec224b7 · ec224b7
2 parents 45aaba2 + 33e4c8a
commit ec224b7
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 25 deletions.
diff --git a/src/rebar_compiler.erl b/src/rebar_compiler.erl
@@ -140,14 +140,14 @@ compile_queue(Targets, Pids, Opts, Config, Outs, CompilerMod) ->
             Worker ! {compile, hd(Targets)},
             compile_queue(tl(Targets), Pids, Opts, Config, Outs, CompilerMod);
         {ok, Source} ->
-            ?DEBUG("~sCompiled ~s", [rebar_utils:indent(1), filename:basename(Source)]),
+            ?DEBUG("~sCompiled ~s", [rebar_utils:indent(1), Source]),
             compile_queue(Targets, Pids, Opts, Config, Outs, CompilerMod);
         {{ok, Warnings}, Source} ->
             report(Warnings),
-            ?DEBUG("~sCompiled ~s", [rebar_utils:indent(1), filename:basename(Source)]),
+            ?DEBUG("~sCompiled ~s", [rebar_utils:indent(1), Source]),
             compile_queue(Targets, Pids, Opts, Config, Outs, CompilerMod);
         {skipped, Source} ->
-            ?DEBUG("~sSkipped ~s", [rebar_utils:indent(1), filename:basename(Source)]),
+            ?DEBUG("~sSkipped ~s", [rebar_utils:indent(1), Source]),
             compile_queue(Targets, Pids, Opts, Config, Outs, CompilerMod);
         {Error, Source} ->
             NewSource = format_error_source(Source, Config),

diff --git a/test/rebar_edoc_SUITE.erl b/test/rebar_edoc_SUITE.erl
@@ -58,7 +58,7 @@ error_survival(Config) ->
     RebarConfig = [],
     rebar_test_utils:run_and_check(
         Config, RebarConfig, ["edoc"],
-        {error,{rebar_prv_edoc,{app_failed,"bar2"}}}
+        {error,{rebar_prv_edoc,{app_failed,"bad_bar2"}}}
     ),
     ok.
 

diff --git a/...SUITE_data/bad/apps/bar1/src/bar1.app.src → ...ta/bad/apps/bad_bar1/src/bad_bar1.app.src b/...SUITE_data/bad/apps/bar1/src/bar1.app.src → ...ta/bad/apps/bad_bar1/src/bad_bar1.app.src
@@ -1,8 +1,8 @@
-{application, bar1,
+{application, bad_bar1,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { bar1_app, []}},
+  {mod, { bad_bar1_app, []}},
   {applications,
    [kernel,
     stdlib

diff --git a/...doc_SUITE_data/bad/apps/bar1/src/bar1.erl → ...E_data/bad/apps/bad_bar1/src/bad_bar1.erl b/...doc_SUITE_data/bad/apps/bar1/src/bar1.erl → ...E_data/bad/apps/bad_bar1/src/bad_bar1.erl
@@ -1,9 +1,9 @@
--module(bar1).
+-module(bad_bar1).
 -export([bar1/0]).
 -export_type([barer1/0]).
 
 -type barer1() :: string().
 
 % @doc Bar1 bars the bar.
 -spec bar1() -> barer1().
-bar1() -> "Barer1".
+bar1() -> "Barer1".
diff --git a/...SUITE_data/bad/apps/bar1/src/bar1_app.erl → ...ta/bad/apps/bad_bar1/src/bad_bar1_app.erl b/...SUITE_data/bad/apps/bar1/src/bar1_app.erl → ...ta/bad/apps/bad_bar1/src/bad_bar1_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar1_app).
+-module(bad_bar1_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    bar1_sup:start_link().
+    bad_bar1_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->

diff --git a/...SUITE_data/bad/apps/bar1/src/bar1_sup.erl → ...ta/bad/apps/bad_bar1/src/bad_bar1_sup.erl b/...SUITE_data/bad/apps/bar1/src/bar1_sup.erl → ...ta/bad/apps/bad_bar1/src/bad_bar1_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar1_sup).
+-module(bad_bar1_sup).
 
 -behaviour(supervisor).
 

diff --git a/...SUITE_data/bad/apps/bar2/src/bar2.app.src → ...ta/bad/apps/bad_bar2/src/bad_bar2.app.src b/...SUITE_data/bad/apps/bar2/src/bar2.app.src → ...ta/bad/apps/bad_bar2/src/bad_bar2.app.src
@@ -1,8 +1,8 @@
-{application, bar2,
+{application, bad_bar2,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { bar2_app, []}},
+  {mod, { bad_bar2_app, []}},
   {applications,
    [kernel,
     stdlib

diff --git a/...doc_SUITE_data/bad/apps/bar2/src/bar2.erl → ...E_data/bad/apps/bad_bar2/src/bad_bar2.erl b/...doc_SUITE_data/bad/apps/bar2/src/bar2.erl → ...E_data/bad/apps/bad_bar2/src/bad_bar2.erl
@@ -1,7 +1,7 @@
 %% @doc one docline is fine
 %% @doc a second docline causes a failure
 %% @doc if not, then a & causes a bad ref error.
--module(bar2).
+-module(bad_bar2).
 -export([bar2/0]).
 -export_type([barer2/0]).
 

diff --git a/...SUITE_data/bad/apps/bar2/src/bar2_app.erl → ...ta/bad/apps/bad_bar2/src/bad_bar2_app.erl b/...SUITE_data/bad/apps/bar2/src/bar2_app.erl → ...ta/bad/apps/bad_bar2/src/bad_bar2_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar2_app).
+-module(bad_bar2_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    bar2_sup:start_link().
+    bad_bar2_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->

diff --git a/...SUITE_data/bad/apps/bar2/src/bar2_sup.erl → ...ta/bad/apps/bad_bar2/src/bad_bar2_sup.erl b/...SUITE_data/bad/apps/bar2/src/bar2_sup.erl → ...ta/bad/apps/bad_bar2/src/bad_bar2_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar2_sup).
+-module(bad_bar2_sup).
 
 -behaviour(supervisor).
 

diff --git a/...c_SUITE_data/bad/apps/foo/src/foo.app.src → ...data/bad/apps/bad_foo/src/bad_foo.app.src b/...c_SUITE_data/bad/apps/foo/src/foo.app.src → ...data/bad/apps/bad_foo/src/bad_foo.app.src
@@ -1,12 +1,13 @@
-{application, foo,
+{application, bad_foo,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { foo_app, []}},
+  {mod, { bad_foo_app, []}},
   {applications,
    [kernel,
     stdlib,
-    bar1, bar2
+    bad_bar1,
+    bad_bar2
    ]},
   {env,[]},
   {modules, []},

diff --git a/..._edoc_SUITE_data/bad/apps/foo/src/foo.erl → ...ITE_data/bad/apps/bad_foo/src/bad_foo.erl b/..._edoc_SUITE_data/bad/apps/foo/src/foo.erl → ...ITE_data/bad/apps/bad_foo/src/bad_foo.erl
@@ -1,4 +1,4 @@
--module(foo).
+-module(bad_foo).
 
 -export([foo/0, bar1/0, bar2/0]).
 
@@ -16,4 +16,4 @@ bar1() -> bar1:bar1().
 
 % @doc Bar2 functions returns barer2.
 -spec bar2() -> bar2:barer2().
-bar2() -> bar2:bar2().
+bar2() -> bar2:bar2().
diff --git a/...c_SUITE_data/bad/apps/foo/src/foo_app.erl → ...data/bad/apps/bad_foo/src/bad_foo_app.erl b/...c_SUITE_data/bad/apps/foo/src/foo_app.erl → ...data/bad/apps/bad_foo/src/bad_foo_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(foo_app).
+-module(bad_foo_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    foo_sup:start_link().
+    bad_foo_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->

diff --git a/...c_SUITE_data/bad/apps/foo/src/foo_sup.erl → ...data/bad/apps/bad_foo/src/bad_foo_sup.erl b/...c_SUITE_data/bad/apps/foo/src/foo_sup.erl → ...data/bad/apps/bad_foo/src/bad_foo_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(foo_sup).
+-module(bad_foo_sup).
 
 -behaviour(supervisor).