diff options
author | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
commit | bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (patch) | |
tree | 94dae2ff490c4193df939fc85927ac63af9542e1 /erts/emulator/test/match_spec_SUITE.erl | |
parent | 75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (diff) | |
parent | 2b57228dd5993321a217a89dbe601d1e90b18f33 (diff) | |
download | otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.gz otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.bz2 otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.zip |
Merge branch 'master' of super:otp
Diffstat (limited to 'erts/emulator/test/match_spec_SUITE.erl')
-rw-r--r-- | erts/emulator/test/match_spec_SUITE.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl index bcc46d78ba..330bef7104 100644 --- a/erts/emulator/test/match_spec_SUITE.erl +++ b/erts/emulator/test/match_spec_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -25,6 +25,7 @@ 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, + empty_list/1, unary_plus/1, unary_minus/1, moving_labels/1]). -export([fpe/1]). -export([otp_9422/1]). @@ -60,6 +61,7 @@ all() -> guard_exceptions, unary_plus, unary_minus, fpe, moving_labels, faulty_seq_trace, + empty_list, otp_9422]; true -> [not_run] end. @@ -897,6 +899,11 @@ fpe(Config) when is_list(Config) -> _ -> ok end. +empty_list(Config) when is_list(Config) -> + Val=[{'$1',[], [{message,'$1'},{message,{caller}},{return_trace}]}], + %% Did crash debug VM in faulty assert: + erlang:match_spec_test([],Val,trace). + moving_labels(Config) when is_list(Config) -> %% Force an andalso/orelse construction to be moved by placing it %% in a tuple followed by a constant term. Labels should still |