Update from Upstream

1 files changed, 29 insertions, 2 deletions

diff --git a/test/rebar_eunit_SUITE.erl b/test/rebar_eunit_SUITE.erl
index 41ab6ff..1a8bade 100644
--- a/test/rebar_eunit_SUITE.erl
+++ b/test/rebar_eunit_SUITE.erl
@@ -1,7 +1,8 @@
 -module(rebar_eunit_SUITE).
 
 -export([all/0, groups/0]).
--export([init_per_suite/1, init_per_group/2, end_per_group/2]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_group/2, end_per_group/2]).
 -export([basic_app_compiles/1, basic_app_files/1]).
 -export([basic_app_exports/1, basic_app_testset/1]).
 -export([basic_app_eunit_macro/1]).
@@ -18,6 +19,7 @@
 -export([misspecified_eunit_tests/1]).
 -export([misspecified_eunit_compile_opts/1]).
 -export([misspecified_eunit_first_files/1]).
+-export([alternate_test_regex/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -27,7 +29,8 @@ all() ->
     [{group, basic_app}, {group, multi_app}, {group, cmd_line_args},
      misspecified_eunit_tests,
      misspecified_eunit_compile_opts,
-     misspecified_eunit_first_files].
+     misspecified_eunit_first_files,
+     alternate_test_regex].
 
 groups() ->
     [{basic_app, [sequence], [basic_app_compiles, {group, basic_app_results}]},
@@ -58,6 +61,8 @@ init_per_suite(Config) ->
     {ok, _} = zip:extract(filename:join([PrivDir, "multi_app.zip"]), [{cwd, PrivDir}]),
     Config.
 
+end_per_suite(Config) -> Config.
+
 init_per_group(basic_app, Config) ->
     GroupState = rebar_test_utils:init_rebar_state(Config, "basic_app_"),
 
@@ -579,3 +584,25 @@ misspecified_eunit_first_files(Config) ->
     {error, {rebar_prv_eunit, Error}} = rebar_test_utils:run_and_check(State, RebarConfig, ["eunit"], return),
 
     {badconfig, {"Value `~p' of option `~p' must be a list", {some_file, eunit_first_files}}} = Error.
+
+alternate_test_regex(Config) ->
+    State = rebar_test_utils:init_rebar_state(Config, "alternate_test_regex_"),
+
+    AppDir = ?config(apps, State),
+    PrivDir = ?config(priv_dir, State),
+
+    AppDirs = ["src", "include", "test"],
+
+    lists:foreach(fun(F) -> ec_file:copy(filename:join([PrivDir, "basic_app", F]),
+                                         filename:join([AppDir, F]),
+                                         [recursive]) end, AppDirs),
+
+    BaseConfig = [{erl_opts, [{d, config_define}]}, {eunit_compile_opts, [{d, eunit_compile_define}]}],
+
+    RebarConfig = [{eunit_test_regex, "basic_app_tests.erl"}|BaseConfig],
+
+    {ok, S} = rebar_test_utils:run_and_check(State, RebarConfig, ["as", "test", "lock"], return),
+
+    Set = {ok, [{application, basic_app},
+                {module, basic_app_tests}]},
+    Set = rebar_prv_eunit:prepare_tests(S).