diff options
| author | Sverker Eriksson <[email protected]> | 2011-11-18 17:42:28 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-11-18 17:42:28 +0100 |
| commit | 7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8 (patch) | |
| tree | f9cbbd41ccf67517b8d9c7423ee2b3d64c6bba31 /lib/stdlib/test | |
| parent | b130455e73b0bcacee2bfd3dfe6bafa9dd497886 (diff) | |
| parent | 327c072661840f671fc0041bc5e88bc69691d5aa (diff) | |
| download | otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.tar.gz otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.tar.bz2 otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.zip | |
Merge branch 'sverk/hipe-without-fpe/OTP-9724'
* sverk/hipe-without-fpe/OTP-9724:
otp_build: Disable FPE by default on Linux
stdlib: Make sure qlc_SUITE:otp_6964 restores backtrace_depth
erts: Add test for inf/NaN intermediate float results
hipe,erts: Allow hipe without floating point exceptions
hipe: Fix bug in hipe_rtl_lcm:calc_killed_expr_bb
erts: Rename macros used by float instructions without FPE
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/qlc_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl index 8a9d8f7883..9be547c690 100644 --- a/lib/stdlib/test/qlc_SUITE.erl +++ b/lib/stdlib/test/qlc_SUITE.erl @@ -6118,6 +6118,7 @@ otp_6964(Config) when is_list(Config) -> qlc:e(Q, [{max_list_size,64*1024},{tmpdir_usage,Use}]) end, D = erlang:system_flag(backtrace_depth, 0), + try 20000 = length(F(allowed)), ErrReply = F(not_allowed), {error, qlc, {tmpdir_usage,joining}} = ErrReply, @@ -6129,8 +6130,10 @@ otp_6964(Config) when is_list(Config) -> 20000 = length(F(info_msg)), {info, joining} = qlc_SUITE:read_error_logger(), 20000 = length(F(error_msg)), - {error, joining} = qlc_SUITE:read_error_logger(), - _ = erlang:system_flag(backtrace_depth, D), + {error, joining} = qlc_SUITE:read_error_logger() + after + _ = erlang:system_flag(backtrace_depth, D) + end, qlc_SUITE:uninstall_error_logger()">>], ?line run(Config, T1), |