[commit: testsuite] ghc-7.4: Make numrun012 work with excess-precision.(#5856) (f7f18ef)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/f7f18efa063acc0dec1a0bfd708e917c8a8d6c08

>---------------------------------------------------------------

commit f7f18efa063acc0dec1a0bfd708e917c8a8d6c08
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date:   Tue Jul 10 15:11:37 2012 +0100

    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 df8c690..18cef65 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 f94829c..b1bab9d 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 ffd0389..6d7756b 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