Merge pull request #4403 from esl/rerun-failed-tests

Enable 'rerun failed tests' for big tests in CircleCI

tools/select_suites_to_run.erl

@@ -0,0 +1,28 @@
+%% Escript used to filter the test spec according to a list of allowed suites
+%% This is used to rerun failed tests on CircleCI
+%%
+%% Arguments: TEST_SPEC SUITE1 SUITE2 ..
+%% Example arguments: default.spec muc_SUITE rdbms_SUITE
+
+-module(select_suites_to_run).
+-export([main/1]).
+
+main([SpecFile | SuiteStrings]) ->
+    Suites = [list_to_atom(Str) || Str <- SuiteStrings],
+    io:format("Allowed suites: ~p~n", [Suites]),
+    {ok, OldTerms} = file:consult(SpecFile),
+    NewTerms = lists:filter(fun(Term) -> filter_term(Term, Suites) end, OldTerms),
+    write_terms(SpecFile, NewTerms),
+    ok.
+
+filter_term(Term, Suites) when element(1, Term) == suites;
+                               element(1, Term) == groups;
+                               element(1, Term) == cases ->
+    lists:member(element(3, Term), Suites);
+filter_term(_Term, _Suites) ->
+    true.
+
+write_terms(Filename, List) ->
+    Format = fun(Term) -> io_lib:format("~tp.~n", [Term]) end,
+    Text = lists:map(Format, List),
+    file:write_file(Filename, Text).

tools/test.sh

@@ -145,6 +145,7 @@ run_test_preset() {
   cd ${BASE}/big_tests
   local MAKE_RESULT=0
   TESTSPEC=${TESTSPEC:-default.spec}
+  maybe_select_suites
   if [ "$COVER_ENABLED" = "true" ]; then
     make cover_test_preset TESTSPEC=$TESTSPEC PRESET=$PRESET CT_HOOKS=$CT_HOOKS
     MAKE_RESULT=$?
@@ -157,6 +158,14 @@ run_test_preset() {
   return ${MAKE_RESULT}
 }
 
+maybe_select_suites() {
+    if command -v circleci; then
+        circleci tests glob tests/*_SUITE.erl | \
+            circleci tests run --command=">selected_suites xargs -d' ' -I {} basename {} .erl"
+        escript ../tools/select_suites_to_run.erl $TESTSPEC $(<selected_suites)
+    fi
+}
+
 print_running_nodes() {
     echo "Running nodes:"
     # Expand wildcard into a bash array