Merge branch 'sverk/ets-test-cuddle' into maint

* sverk/ets-test-cuddle:
  stdlib: Make memcheck in ets_SUITE less sensitive

1 files changed, 53 insertions, 15 deletions

diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index af5d5a8f21..bd69019892 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -75,6 +75,7 @@
 -export([otp_9932/1]).
 -export([otp_9423/1]).
 -export([otp_10182/1]).
+-export([memory_check_summary/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -149,7 +150,9 @@ all() ->
      give_away, setopts, bad_table, types,
      otp_10182,
      otp_9932,
-     otp_9423].
+     otp_9423,
+     
+     memory_check_summary]. % MUST BE LAST
 
 groups() -> 
     [{new, [],
@@ -185,7 +188,8 @@ init_per_suite(Config) ->
 
 end_per_suite(_Config) ->
     stop_spawn_logger(),
-    catch erts_debug:set_internal_state(available_internal_state, false).
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    ok.
 
 init_per_group(_GroupName, Config) ->
 	Config.
@@ -193,6 +197,26 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
+%% Test that we did not have "too many" failed verify_etsmem()'s
+%% in the test suite.
+%% verify_etsmem() may give a low number of false positives
+%% as concurrent activities, such as lingering processes
+%% from earlier test suites, may do unrelated ets (de)allocations.
+memory_check_summary(_Config) ->
+    case whereis(ets_test_spawn_logger) of
+	undefined ->
+	    ?t:fail("No spawn logger exist");
+	_ ->
+	    ets_test_spawn_logger ! {self(), get_failed_memchecks},
+	    receive {get_failed_memchecks, FailedMemchecks} -> ok end,
+	    io:format("Failed memchecks: ~p\n",[FailedMemchecks]),
+	    if FailedMemchecks > 3 ->
+		    ct:fail("Too many failed (~p) memchecks", [FailedMemchecks]);
+	       true ->
+		    ok
+	    end
+    end.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -5635,7 +5659,8 @@ verify_etsmem({MemInfo,AllTabs}) ->
 	    io:format("Actual:   ~p", [MemInfo2]),
 	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
 	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
-	    ?t:fail()
+	    ets_test_spawn_logger ! failed_memcheck,
+	    {comment, "Failed memory check"}
     end.
 
 
@@ -5657,10 +5682,10 @@ stop_loopers(Loopers) ->
 looper(Fun, State) ->
     looper(Fun, Fun(State)).
 
-spawn_logger(Procs) ->
+spawn_logger(Procs, FailedMemchecks) ->
     receive
 	{new_test_proc, Proc} ->
-	    spawn_logger([Proc|Procs]);
+	    spawn_logger([Proc|Procs], FailedMemchecks);
 	{sync_test_procs, Kill, From} ->
 	    lists:foreach(fun (Proc) when From == Proc ->
 				  ok;
@@ -5683,7 +5708,14 @@ spawn_logger(Procs) ->
 				  end
 			  end, Procs),
 	    From ! test_procs_synced,
-	    spawn_logger([From])
+	    spawn_logger([From], FailedMemchecks);
+
+	failed_memcheck ->
+	    spawn_logger(Procs, FailedMemchecks+1);
+
+	{Pid, get_failed_memchecks} ->
+	    Pid ! {get_failed_memchecks, FailedMemchecks},
+	    spawn_logger(Procs, FailedMemchecks)
     end.
 
 pid_status(Pid) ->
@@ -5699,7 +5731,7 @@ start_spawn_logger() ->
     case whereis(ets_test_spawn_logger) of
 	Pid when is_pid(Pid) -> true;
 	_ -> register(ets_test_spawn_logger,
-		      spawn_opt(fun () -> spawn_logger([]) end,
+		      spawn_opt(fun () -> spawn_logger([], 0) end,
 				[{priority, max}]))
     end.
 
@@ -5710,8 +5742,7 @@ start_spawn_logger() ->
 stop_spawn_logger() ->
     Mon = erlang:monitor(process, ets_test_spawn_logger),
     (catch exit(whereis(ets_test_spawn_logger), kill)),
-    receive {'DOWN', Mon, _, _, _} -> ok end,
-    ok.
+    receive {'DOWN', Mon, _, _, _} -> ok end.
 
 wait_for_test_procs() ->
     wait_for_test_procs(false).
@@ -5811,7 +5842,7 @@ spawn_monitor_with_pid(Pid, Fun, N) ->
 		  end) of
 	Pid ->
 	    {Pid, erlang:monitor(process, Pid)};
-	Other ->
+	_Other ->
 	    spawn_monitor_with_pid(Pid,Fun,N-1)
     end.
 
@@ -6117,11 +6148,18 @@ repeat_for_opts(F, OptGenList) ->
     repeat_for_opts(F, OptGenList, []).
 
 repeat_for_opts(F, [], Acc) ->
-    lists:map(fun(Opts) ->
-                    OptList = lists:filter(fun(E) -> E =/= void end, Opts),
-                    io:format("Calling with options ~p\n",[OptList]),
-		            F(OptList)
-	          end, Acc);
+    lists:foldl(fun(Opts, RV_Acc) ->
+			OptList = lists:filter(fun(E) -> E =/= void end, Opts),
+			io:format("Calling with options ~p\n",[OptList]),
+			RV = F(OptList),
+			case RV_Acc of
+			    {comment,_} -> RV_Acc;
+			    _ -> case RV of
+				     {comment,_} -> RV;
+				     _ -> [RV | RV_Acc]
+				 end
+			end
+	          end, [], Acc);
 repeat_for_opts(F, [OptList | Tail], []) when is_list(OptList) ->
     repeat_for_opts(F, Tail, [[Opt] || Opt <- OptList]);
 repeat_for_opts(F, [OptList | Tail], AccList) when is_list(OptList) ->