Changeset: 9815817a849c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9815817a849c
Removed Files:
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
Modified Files:
monetdb5/tests/gdkTests/Tests/casts.mal
monetdb5/tests/gdkTests/Tests/casts.stable.out
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64
monetdb5/tests/gdkTests/Tests/casts.stable.out.oid64
Branch: Jul2012
Log Message:
casts: slightly change to trigger less CPU-dependent differences
Avoid being on the edge of what an int or lng can hold, but go far
beyond it, such that representations on different CPUs (most prominently
big-endian CPUs) don't trigger the overflow that was anticipated for.
Hopefully this makes the test run fine also on PowerPC (vomac/Darwin,
macbeth/Linux) and should remove the need for SunOS output (Sparc for
real).
diffs (truncated from 8006 to 300 lines):
diff --git a/monetdb5/tests/gdkTests/Tests/casts.mal
b/monetdb5/tests/gdkTests/Tests/casts.mal
--- a/monetdb5/tests/gdkTests/Tests/casts.mal
+++ b/monetdb5/tests/gdkTests/Tests/casts.mal
@@ -113,12 +113,10 @@ io.printf("# io.print(-0.9:int);\n");
io.print(-0.9:int);
io.printf("# io.print(-1.0:int);\n");
io.print(-1.0:int);
-io.printf("# io.print(2147483647.0:int);\n");
-io.print(2147483647.0:int);
-io.printf("# io.print(2147483648.0:int);\n");
-io.print(2147483648.0:int);
-io.printf("# io.print(2147483649.0:int);\n");
-io.print(2147483649.0:int);
+# avoid being around the int edge, e.g PowerPC has different internal
+# representation, leading to non-nil integer results
+io.printf("# io.print(2147483847.0:int);\n");
+io.print(2147483847.0:int);
io.printf("# io.print(-2147483647.0:int);\n");
io.print(-2147483647.0:int);
io.printf("# io.print(-2147483648.0:int);\n");
@@ -593,12 +591,8 @@ io.printf("# io.print(-2147483648.0:lng)
io.print(-2147483648.0:lng);
io.printf("# io.print(-2147483649.0:lng);\n");
io.print(-2147483649.0:lng);
-io.printf("# io.print(9223372036854775807.0:lng);\n");
-io.print(9223372036854775807.0:lng);
-io.printf("# io.print(9223372036854775808.0:lng);\n");
-io.print(9223372036854775808.0:lng);
-io.printf("# io.print(9223372036854775809.0:lng);\n");
-io.print(9223372036854775809.0:lng);
+io.printf("# io.print(9223972036854775807.0:lng);\n");
+io.print(9223972036854775807.0:lng);
io.printf("# io.print(-9223372036854775807.0:lng);\n");
io.print(-9223372036854775807.0:lng);
io.printf("# io.print(-9223372036854775808.0:lng);\n");
@@ -637,12 +631,8 @@ io.printf("# io.print(-2147483648.0LL:ln
io.print(-2147483648.0LL:lng);
io.printf("# io.print(-2147483649.0LL:lng);\n");
io.print(-2147483649.0LL:lng);
-io.printf("# io.print(9223372036854775807.0LL:lng);\n");
-io.print(9223372036854775807.0LL:lng);
-io.printf("# io.print(9223372036854775808.0LL:lng);\n");
-io.print(9223372036854775808.0LL:lng);
-io.printf("# io.print(9223372036854775809.0LL:lng);\n");
-io.print(9223372036854775809.0LL:lng);
+io.printf("# io.print(9223372036854779807.0LL:lng);\n");
+io.print(9223372036854779807.0LL:lng);
io.printf("# io.print(-9223372036854775807.0LL:lng);\n");
io.print(-9223372036854775807.0LL:lng);
io.printf("# io.print(-9223372036854775808.0LL:lng);\n");
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out
b/monetdb5/tests/gdkTests/Tests/casts.stable.out
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out
@@ -132,11 +132,9 @@ exit MALException:str ;
io.print(0:int);
io.printf("# io.print(-1.0:int);\n");
io.print(-1:int);
- io.printf("# io.print(2147483647.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483648.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483649.0:int);\n");
+# avoid being around the int edge, e.g PowerPC has different internal
+# representation, leading to non-nil integer results
+ io.printf("# io.print(2147483847.0:int);\n");
io.print(nil:int);
io.printf("# io.print(-2147483647.0:int);\n");
io.print(nil:int);
@@ -648,11 +646,7 @@ exit MALException:str ;
io.print(-2147483648:lng);
io.printf("# io.print(-2147483649.0:lng);\n");
io.print(-2147483648:lng);
- io.printf("# io.print(9223372036854775807.0:lng);\n");
- io.print(nil:lng);
- io.printf("# io.print(9223372036854775808.0:lng);\n");
- io.print(nil:lng);
- io.printf("# io.print(9223372036854775809.0:lng);\n");
+ io.printf("# io.print(9223972036854775807.0:lng);\n");
io.print(nil:lng);
io.printf("# io.print(-9223372036854775807.0:lng);\n");
io.print(nil:lng);
@@ -691,11 +685,7 @@ exit MALException:str ;
io.print(-2147483648:lng);
io.printf("# io.print(-2147483649.0LL:lng);\n");
io.print(-2147483649:lng);
- io.printf("# io.print(9223372036854775807.0LL:lng);\n");
- io.print(nil:lng);
- io.printf("# io.print(9223372036854775808.0LL:lng);\n");
- io.print(nil:lng);
- io.printf("# io.print(9223372036854775809.0LL:lng);\n");
+ io.printf("# io.print(9223372036854779807.0LL:lng);\n");
io.print(nil:lng);
io.printf("# io.print(-9223372036854775807.0LL:lng);\n");
io.print(nil:lng);
@@ -2397,11 +2387,7 @@ Caught exception
[ 0 ]
# io.print(-1.0:int);
[ -1 ]
-# io.print(2147483647.0:int);
-[ nil ]
-# io.print(2147483648.0:int);
-[ nil ]
-# io.print(2147483649.0:int);
+# io.print(2147483847.0:int);
[ nil ]
# io.print(-2147483647.0:int);
[ nil ]
@@ -2795,11 +2781,7 @@ Caught exception
[ -2147483648 ]
# io.print(-2147483649.0:lng);
[ -2147483648 ]
-# io.print(9223372036854775807.0:lng);
-[ nil ]
-# io.print(9223372036854775808.0:lng);
-[ nil ]
-# io.print(9223372036854775809.0:lng);
+# io.print(9223972036854775807.0:lng);
[ nil ]
# io.print(-9223372036854775807.0:lng);
[ nil ]
@@ -2838,11 +2820,7 @@ Caught exception
[ -2147483648 ]
# io.print(-2147483649.0LL:lng);
[ -2147483649 ]
-# io.print(9223372036854775807.0LL:lng);
-[ nil ]
-# io.print(9223372036854775808.0LL:lng);
-[ nil ]
-# io.print(9223372036854775809.0LL:lng);
+# io.print(9223372036854779807.0LL:lng);
[ nil ]
# io.print(-9223372036854775807.0LL:lng);
[ nil ]
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
deleted file mode 100644
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
+++ /dev/null
@@ -1,3805 +0,0 @@
-stdout of test 'casts` in directory 'tests/gdkTests` itself:
-
-
-# 13:08:25 >
-# 13:08:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/home/sjoerd/Monet-devel32/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=31444" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_tests_gdkTests"
"casts.mal"
-# 13:08:25 >
-
-# MonetDB 5 server v11.10.0 (hg id: cb8a3f6efb36)
-# This is an unreleased version
-# Serving database 'mTests_tests_gdkTests', using 2 threads
-# Compiled for sparc-sun-solaris2.10/32bit with 32bit OIDs dynamically linked
-# Found 4.000 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-#WARNING: LoaderException:loadLibrary:failed to load library: ld.so.1:
mserver5: fatal: libz.so.1: open failed: No such file or directory
-#WARNING: LoaderException:loadLibrary:failed to load library: ld.so.1:
mserver5: fatal: libz.so.1: open failed: No such file or directory
-# Listening for connection requests on mapi:monetdb://vuurbal:31444/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-function user.main():void;
- io.printf("# casting to int\n");
- io.printf("# io.print(0);\n");
- io.print(0);
- io.printf("# io.print(1);\n");
- io.print(1);
- io.printf("# io.print(32767);\n");
- io.print(32767);
- io.printf("# io.print(32768);\n");
- io.print(32768);
- io.printf("# io.print(32769);\n");
- io.print(32769);
- io.printf("# io.print(2147483647);\n");
- io.print(2147483647);
- io.printf("# io.print(2147483648);\n");
- io.print(2147483648:lng);
- io.printf("# io.print(2147483649);\n");
- io.print(2147483649:lng);
- io.printf("# io.print(-2147483647);\n");
- io.print(-2147483647);
- io.printf("# io.print(-2147483648);\n");
- io.print(-2147483648:lng);
- io.printf("# io.print(-2147483649);\n");
- io.print(-2147483649:lng);
- io.printf("# int from bit\n");
- io.printf("# bi:= true:int; io.print(bi);\n");
- bi := 1:int;
- io.print(bi);
- io.printf("# bi:= false:int; io.print(bi);\n");
- bi := 0:int;
- io.print(bi);
- io.printf("# int from sht\n");
- io.printf("# sh:= 1:sht; si:= calc.int(sh); io.print(si);\n");
- sh := 1:sht;
- si := calc.int(sh);
- io.print(si);
- io.printf("# sh:= 32767:sht; si:= calc.int(sh); io.print(si);\n");
- sh := 32767:sht;
- si := calc.int(sh);
- io.print(si);
- io.printf("# int from int\n");
- io.printf("# io.print(1:int);\n");
- io.print(1:int);
- io.printf("# io.print(32767:int);\n");
- io.print(32767:int);
- io.printf("# io.print(32768:int);\n");
- io.print(32768:int);
- io.printf("# io.print(2147483647:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(-2147483647:int);\n");
- io.print(-2147483647:int);
- io.printf("# i:= 2147483647:int+1:int;\n");
- i := calc.+(2147483647:int,1:int);
-catch MALException:str ;
- io.printf("Caught exception\n");
-exit MALException:str ;
- io.printf("# io.print(i);\n");
- io.print(i);
- io.printf("# z:= -2147483647:int - 1:int;\n");
- z := calc.-(-2147483647:int,1:int);
-catch MALException:str ;
- io.printf("Caught exception\n");
-exit MALException:str ;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# should this produce nil (overflow)?\n");
- io.printf("# z:= 2147483647:int + 2:int;\n");
- z := calc.+(2147483647:int,2:int);
-catch MALException:str ;
- io.printf("Caught exception\n");
-exit MALException:str ;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# should this produce nil (overflow)?\n");
- io.printf("# z:= -2147483647:int - 2:int;\n");
- z := calc.-(-2147483647:int,2:int);
-catch MALException:str ;
- io.printf("Caught exception\n");
-exit MALException:str ;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# int from lng\n");
- io.printf("# io.print(1LL:int);\n");
- io.print(1:int);
- io.printf("# io.print(2147483647LL:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483648LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483649LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483647LL:int);\n");
- io.print(-2147483647:int);
- io.printf("# io.print(-2147483648LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483649LL:int);\n");
- io.print(nil:int);
- io.printf("# int from flt\n");
- io.printf("# io.print(0.0:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.1:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.5:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.9:int);\n");
- io.print(0:int);
- io.printf("# io.print(1.0:int);\n");
- io.print(1:int);
- io.printf("# io.print(-0.1:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.5:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.9:int);\n");
- io.print(0:int);
- io.printf("# io.print(-1.0:int);\n");
- io.print(-1:int);
- io.printf("# io.print(2147483647.0:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483648.0:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483649.0:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(-2147483647.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483648.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483649.0:int);\n");
- io.print(nil:int);
- io.printf("# int from dbl\n");
- io.printf("# io.print(0.0LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.1LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.5LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.9LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(1.0LL:int);\n");
- io.print(1:int);
- io.printf("# io.print(-0.1LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.5LL:int);\n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
