From f7f18efa063acc0dec1a0bfd708e917c8a8d6c08 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti <p.capriotti@gmail.com> Date: Tue, 10 Jul 2012 15:11:37 +0100 Subject: [PATCH] Make numrun012 work with excess-precision.(#5856) Remove exact base 2 logarithms, since their values depend on whether excess precision is used or not (see also #5165). MERGED from commits 5774835f02acf3ef8b587cec737bc4d66bb04026 and 19fc8e321193578a1409e837d907fb90555b342c. --- tests/numeric/should_run/numrun012.hs | 4 ++-- tests/numeric/should_run/numrun012.stdout | 2 +- tests/numeric/should_run/numrun012.stdout-ws-64 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/numeric/should_run/numrun012.hs b/tests/numeric/should_run/numrun012.hs index df8c69040..18cef65e2 100644 --- a/tests/numeric/should_run/numrun012.hs +++ b/tests/numeric/should_run/numrun012.hs @@ -30,6 +30,6 @@ log2 x = ceiling log_x log_x = logBase 2 (fromIntegral (max 1 x)) vals = [1, 2, 17, 259, 1000, 10000, - 2^30 + 9000, 2^31 - 1, 2^31, 2^31 + 1, - 2^32 - 1, 2^32, 2^32 + 1] + 2^30 + 9000, 2^31 - 1, 2^31 + 1, + 2^32 - 1, 2^32 + 1] diff --git a/tests/numeric/should_run/numrun012.stdout b/tests/numeric/should_run/numrun012.stdout index f94829ccf..b1bab9d97 100644 --- a/tests/numeric/should_run/numrun012.stdout +++ b/tests/numeric/should_run/numrun012.stdout @@ -1,4 +1,4 @@ -[0,1,5,9,10,14,31,31,32,32,32,32,33] +[0,1,5,9,10,14,31,31,32,32,33] -2.147483648e9 -2.1474836e9 -2.147483648e9 diff --git a/tests/numeric/should_run/numrun012.stdout-ws-64 b/tests/numeric/should_run/numrun012.stdout-ws-64 index ffd038920..6d7756bdd 100644 --- a/tests/numeric/should_run/numrun012.stdout-ws-64 +++ b/tests/numeric/should_run/numrun012.stdout-ws-64 @@ -1,4 +1,4 @@ -[0,1,5,9,10,14,31,31,32,32,32,32,33] +[0,1,5,9,10,14,31,31,32,32,33] 2.147483648e9 8589934592 2.1474836e9 -- GitLab