[commit: ghc] master: testsuite: Fix tests expecting 64-bit word size (e1a98fa)

git at git.haskell.org git at git.haskell.org
Sat Dec 8 04:28:47 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e1a98fabd4cc40b8f5401a058e6bf2f59596f698/ghc

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

commit e1a98fabd4cc40b8f5401a058e6bf2f59596f698
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 7 12:46:02 2018 -0500

    testsuite: Fix tests expecting 64-bit word size
    
    These were added in 75a8349b2a7d0142d3d687837caf5a95bbb4368d.


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

e1a98fabd4cc40b8f5401a058e6bf2f59596f698
 .../{Overflow.stderr => Overflow.stderr-ws-32}               | 12 ++++++------
 .../{Overflow.stderr => Overflow.stderr-ws-64}               |  0
 .../should_compile/{T10930.stderr => T10930.stderr-ws-32}    |  5 +++--
 .../should_compile/{T10930.stderr => T10930.stderr-ws-64}    |  0
 .../should_compile/{T13256.stderr => T13256.stderr-ws-32}    |  2 +-
 .../should_compile/{T13256.stderr => T13256.stderr-ws-64}    |  0
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/testsuite/tests/warnings/should_compile/Overflow.stderr b/testsuite/tests/warnings/should_compile/Overflow.stderr-ws-32
similarity index 67%
copy from testsuite/tests/warnings/should_compile/Overflow.stderr
copy to testsuite/tests/warnings/should_compile/Overflow.stderr-ws-32
index ce657ae..0868f26 100644
--- a/testsuite/tests/warnings/should_compile/Overflow.stderr
+++ b/testsuite/tests/warnings/should_compile/Overflow.stderr-ws-32
@@ -1,18 +1,18 @@
 
 Overflow.hs:8:15: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal 10000000000000000000000000000000 is out of the Int# range -9223372036854775808..9223372036854775807
+    Literal 10000000000000000000000000000000 is out of the Int# range -2147483648..2147483647
 
 Overflow.hs:13:1: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal 100000000000000000000000000 is out of the Int# range -9223372036854775808..9223372036854775807
+    Literal 100000000000000000000000000 is out of the Int# range -2147483648..2147483647
 
 Overflow.hs:18:5: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal 1000000000000000000000000000000 is out of the Int range -9223372036854775808..9223372036854775807
+    Literal 1000000000000000000000000000000 is out of the Int range -2147483648..2147483647
 
 Overflow.hs:22:1: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal 100000000000000000000000000000000 is out of the Int range -9223372036854775808..9223372036854775807
+    Literal 100000000000000000000000000000000 is out of the Int range -2147483648..2147483647
 
 Overflow.hs:27:6: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal -1 is out of the Word range 0..18446744073709551615
+    Literal -1 is out of the Word range 0..4294967295
 
 Overflow.hs:31:1: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal -1 is out of the Word range 0..18446744073709551615
+    Literal -1 is out of the Word range 0..4294967295
diff --git a/testsuite/tests/warnings/should_compile/Overflow.stderr b/testsuite/tests/warnings/should_compile/Overflow.stderr-ws-64
similarity index 100%
rename from testsuite/tests/warnings/should_compile/Overflow.stderr
rename to testsuite/tests/warnings/should_compile/Overflow.stderr-ws-64
diff --git a/testsuite/tests/warnings/should_compile/T10930.stderr b/testsuite/tests/warnings/should_compile/T10930.stderr-ws-32
similarity index 66%
copy from testsuite/tests/warnings/should_compile/T10930.stderr
copy to testsuite/tests/warnings/should_compile/T10930.stderr-ws-32
index 1b593b9..8fcd1a3 100644
--- a/testsuite/tests/warnings/should_compile/T10930.stderr
+++ b/testsuite/tests/warnings/should_compile/T10930.stderr-ws-32
@@ -1,11 +1,12 @@
 
 T10930.hs:6:5: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal -123 is out of the Word range 0..18446744073709551615
+    Literal -123 is out of the Word range 0..4294967295
 
 T10930.hs:7:5: warning: [-Woverflowed-literals (in -Wdefault)]
     Literal -123 is negative but Natural only supports positive numbers
 
-T10930.hs:9:5: warning: [-Wempty-enumerations (in -Wdefault)] Enumeration is empty
+T10930.hs:9:5: warning: [-Wempty-enumerations (in -Wdefault)]
+    Enumeration is empty
 
 T10930.hs:10:5: warning: [-Wempty-enumerations (in -Wdefault)]
     Enumeration is empty
diff --git a/testsuite/tests/warnings/should_compile/T10930.stderr b/testsuite/tests/warnings/should_compile/T10930.stderr-ws-64
similarity index 100%
rename from testsuite/tests/warnings/should_compile/T10930.stderr
rename to testsuite/tests/warnings/should_compile/T10930.stderr-ws-64
diff --git a/testsuite/tests/warnings/should_compile/T13256.stderr b/testsuite/tests/warnings/should_compile/T13256.stderr-ws-32
similarity index 72%
copy from testsuite/tests/warnings/should_compile/T13256.stderr
copy to testsuite/tests/warnings/should_compile/T13256.stderr-ws-32
index 6b06a7d..6309a97 100644
--- a/testsuite/tests/warnings/should_compile/T13256.stderr
+++ b/testsuite/tests/warnings/should_compile/T13256.stderr-ws-32
@@ -1,3 +1,3 @@
 
 T13256.hs:4:12: warning: [-Woverflowed-literals (in -Wdefault)]
-    Literal 100000000000000000000000000000000 is out of the Int range -9223372036854775808..9223372036854775807
+    Literal 100000000000000000000000000000000 is out of the Int range -2147483648..2147483647
diff --git a/testsuite/tests/warnings/should_compile/T13256.stderr b/testsuite/tests/warnings/should_compile/T13256.stderr-ws-64
similarity index 100%
rename from testsuite/tests/warnings/should_compile/T13256.stderr
rename to testsuite/tests/warnings/should_compile/T13256.stderr-ws-64



More information about the ghc-commits mailing list