More fixes for bad calls to find_apps

src/rebar_prv_plugins.erl

@@ -42,9 +42,9 @@ do(State) ->
     RebarOpts = rebar_state:opts(State),
     SrcDirs = rebar_dir:src_dirs(RebarOpts, ["src"]),
     Plugins = rebar_state:get(State, plugins, []),
-    PluginsDir = filename:join(rebar_dir:plugins_dir(State), "*"),
-    CheckoutsDir = filename:join(rebar_dir:checkouts_dir(State), "*"),
-    Apps = rebar_app_discover:find_apps([CheckoutsDir, PluginsDir], SrcDirs, all),
+    PluginsDirs = filelib:wildcard(filename:join(rebar_dir:plugins_dir(State), "*")),
+    CheckoutsDirs = filelib:wildcard(filename:join(rebar_dir:checkouts_dir(State), "*")),
+    Apps = rebar_app_discover:find_apps(CheckoutsDirs++PluginsDirs, SrcDirs, all),
     display_plugins("Local plugins", Apps, Plugins),
     {ok, State}.
 

test/rebar_test_utils.erl

@@ -218,7 +218,7 @@ check_results(AppDir, Expected, ProfileRun) ->
     BuildDirs = filelib:wildcard(filename:join([AppDir, "_build", ProfileRun, "lib", "*"])),
     PluginDirs = filelib:wildcard(filename:join([AppDir, "_build", ProfileRun, "plugins", "*"])),
     GlobalPluginDirs = filelib:wildcard(filename:join([AppDir, "global", "plugins", "*"])),
-    CheckoutsDir = filename:join([AppDir, "_checkouts", "*"]),
+    CheckoutsDirs = filelib:wildcard(filename:join([AppDir, "_checkouts", "*"])),
     LockFile = filename:join([AppDir, "rebar.lock"]),
     Locks = lists:flatten(rebar_config:consult_lock_file(LockFile)),
 
@@ -230,7 +230,7 @@ check_results(AppDir, Expected, ProfileRun) ->
 
     Deps = rebar_app_discover:find_apps(BuildDirs, all),
     DepsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Deps],
-    Checkouts = rebar_app_discover:find_apps([CheckoutsDirspan>], all),
+    Checkouts = rebar_app_discover:find_apps(CheckoutsDirs, all),
     CheckoutsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Checkouts],
     Plugins = rebar_app_discover:find_apps(PluginDirs, all),
     PluginsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Plugins],