2 files changed, 23 insertions, 3 deletions
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index a642c3a63a..eaecd32f95 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -78,7 +78,13 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
 
 end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    ?t:timetrap_cancel(Dog),
+
+    %% Reloading the module will clear all trace patterns, and
+    %% in a debug-compiled emulator run assertions of the counters
+    %% for the number of traced exported functions in this module.
+
+    c:l(?MODULE).
 
 hipe(Config) when is_list(Config) ->
     ?line 0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true),
@@ -187,7 +193,12 @@ basic() ->
     %% Trace some functions...
 
     ?line trace_func({lists,'_','_'}, []),
+
+    %% Make sure that tracing the same functions more than once
+    %% does not cause any problems.
     ?line 3 = trace_func({?MODULE,foo,'_'}, true),
+    ?line 3 = trace_func({?MODULE,foo,'_'}, true),
+    ?line 1 = trace_func({?MODULE,bar,0}, true),
     ?line 1 = trace_func({?MODULE,bar,0}, true),
     ?line {traced,global} = trace_info({?MODULE,bar,0}, traced),
     ?line 1 = trace_func({erlang,list_to_integer,1}, true),
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 556cf94f57..b238d5c630 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -90,7 +90,15 @@ end_per_testcase(_Case, Config) ->
     shutdown(),
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
-    ok.
+
+    %% Reloading the module will clear all trace patterns, and
+    %% in a debug-compiled emulator run assertions of the counters
+    %% for the number of functions with breakpoints.
+
+    c:l(?MODULE).
+
+
+
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
@@ -352,7 +360,8 @@ same(A, B) ->
 
 basic_test() ->
     ?line setup([call]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
+    NumMatches = erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
+    NumMatches = erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
     ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
     ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
     ?line ?CT(?MODULE,exported_wrap,[1]),