aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-08-12 09:52:37 +0200
committerLukas Larsson <[email protected]>2013-08-12 09:52:37 +0200
commit675390362a7be900e17adc3eb50b898eb2a5ec97 (patch)
treeb3f5f4c02571a19476d3519853976c90a5b293fe /erts/emulator/test
parentb43191903fd7c0f1185f630a436c60dd13b4b1b5 (diff)
parent01a13c00f67112e7996e45439d4eec9e6aa414ce (diff)
downloadotp-675390362a7be900e17adc3eb50b898eb2a5ec97.tar.gz
otp-675390362a7be900e17adc3eb50b898eb2a5ec97.tar.bz2
otp-675390362a7be900e17adc3eb50b898eb2a5ec97.zip
Merge branch 'maint'
* maint: erts: Do not enable TRACE_SILENT when testing a ms
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/match_spec_SUITE.erl12
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 8dbc6b6538..b56b7ce525 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -22,7 +22,7 @@
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
init_per_group/2,end_per_group/2, not_run/1]).
-export([test_1/1, test_2/1, test_3/1, bad_match_spec_bin/1,
- trace_control_word/1, silent/1, silent_no_ms/1,
+ trace_control_word/1, silent/1, silent_no_ms/1, silent_test/1,
ms_trace2/1, ms_trace3/1, boxed_and_small/1,
destructive_in_test_bif/1, guard_exceptions/1,
unary_plus/1, unary_minus/1, moving_labels/1]).
@@ -55,7 +55,7 @@ all() ->
case test_server:is_native(match_spec_SUITE) of
false ->
[test_1, test_2, test_3, bad_match_spec_bin,
- trace_control_word, silent, silent_no_ms, ms_trace2,
+ trace_control_word, silent, silent_no_ms, silent_test, ms_trace2,
ms_trace3, boxed_and_small, destructive_in_test_bif,
guard_exceptions, unary_plus, unary_minus, fpe,
moving_labels,
@@ -501,6 +501,14 @@ silent_no_ms(Config) when is_list(Config) ->
{trace,Tracee,return_to,{?MODULE,f3,2}}]
end).
+silent_test(doc) ->
+ ["Test that match_spec_test does not activate silent"];
+silent_test(_Config) ->
+ {flags,[]} = erlang:trace_info(self(),flags),
+ erlang:match_spec_test([],[{'_',[],[{silent,true}]}],trace),
+ {flags,[]} = erlang:trace_info(self(),flags).
+
+
ms_trace2(doc) ->
["Test the match spec functions {trace/2}"];
ms_trace2(suite) -> [];