diff options
author | Sverker Eriksson <[email protected]> | 2014-01-27 19:30:32 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-01-27 19:31:24 +0100 |
commit | bece9227ecffb5f164a383a826f63835bd32175a (patch) | |
tree | 9dc5c751d0d69254aee69c58696c2c314c70069e /erts/emulator/test/match_spec_SUITE.erl | |
parent | a6ffce4547a3a2c4cb1409a0a679a64b9afdfe9f (diff) | |
parent | 29196a3528e034d3d46ec4589749074f8d766b97 (diff) | |
download | otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.gz otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.bz2 otp-bece9227ecffb5f164a383a826f63835bd32175a.zip |
Merge branch 'sverk/misc-bug-fixes'
OTP-11618
* sverk/misc-bug-fixes:
erts: Fix faulty assert in match spec engine.
erts: Fix crash when comparing very large floats with integers
erts: Refactor big-float compare on HALFWORD to use C-stack
erts: Fix halfword compile errors in ESTACK
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 |