Changeset: 8ccb7b4922d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ccb7b4922d6
Modified Files:
buildtools/autogen/autogen/msc.py
sql/test/pg_regress/Tests/numeric.sql
sql/test/pg_regress/Tests/numeric.stable.out
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (68 lines):
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -841,7 +841,7 @@ def msc_library(fd, var, libmap, msc):
else:
fd.write("%s.lib: %s%s\n" % (ln, ln, dll))
fd.write("%s%s: $(%s_DEPS) \n" % (ln, dll, ln.replace('-','_')))
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS) -LD
-Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
+ fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
@@ -927,7 +927,7 @@ def msc_libs(fd, var, libsmap, msc):
ln = "lib" + sep + libname
fd.write(ln + ".lib: " + ln + ".dll\n")
fd.write(ln + ".dll: $(" + ln.replace('-','_') + "_DEPS)\n")
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS) -LD
-Fe%s.dll $(%s_OBJS) /link @<<\n$(%s_LIBS)%s\n<<\n' % (ln, ln.replace('-','_'),
ln.replace('-','_'), deffile))
+ fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s.dll $(%s_OBJS) /link @<<\n$(%s_LIBS)%s\n<<\n' % (ln,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
diff --git a/sql/test/pg_regress/Tests/numeric.sql
b/sql/test/pg_regress/Tests/numeric.sql
--- a/sql/test/pg_regress/Tests/numeric.sql
+++ b/sql/test/pg_regress/Tests/numeric.sql
@@ -577,7 +577,8 @@ INSERT INTO num_result SELECT t1.id, t2.
SELECT t1.id1, t1.id2, t1.result, t2.expected
FROM num_result t1, num_exp_div t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
- AND t1.result <> t2.expected;
+ AND t1.result <> t2.expected
+ ORDER BY 1,2,3,4;
DELETE FROM num_result;
INSERT INTO num_result SELECT t1.id, t2.id, round(t1.val / t2.val, 80)
diff --git a/sql/test/pg_regress/Tests/numeric.stable.out
b/sql/test/pg_regress/Tests/numeric.stable.out
--- a/sql/test/pg_regress/Tests/numeric.stable.out
+++ b/sql/test/pg_regress/Tests/numeric.stable.out
@@ -952,7 +952,8 @@ Ready.
#SELECT t1.id1, t1.id2, t1.result, t2.expected
# FROM num_result t1, num_exp_div t2
# WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
-# AND t1.result <> t2.expected;
+# AND t1.result <> t2.expected
+# ORDER BY 1,2,3,4;
% sys.t1, sys.t1, sys.t1, sys.t2 # table_name
% id1, id2, result, expected # name
% int, int, decimal, decimal # type
@@ -996,16 +997,16 @@ Ready.
[ 7, 3, -19264149.65197215700000000000, -19264149.65197215777262180974
]
[ 7, 4, -10.64541262700000000000, -10.64541262725136247686
]
[ 7, 5, -5063.62688881700000000000, -5063.62688881730941836574
]
-[ 7, 6, -884.20756174000000000000, -884.20756174009028770294
]
-[ 7, 8, -1108.80577182400000000000, -1108.80577182462841041118
]
-[ 7, 9, 3.33089171100000000000, 3.33089171198810413382 ]
+[ 7, 6, -884.20756174000000000000, -884.20756174009028770294
]
+[ 7, 8, -1108.80577182400000000000, -1108.80577182462841041118
]
+[ 7, 9, 3.33089171100000000000, 3.33089171198810413382 ]
[ 8, 2, -0.00218067200000000000, -0.00218067233500788615 ]
[ 8, 3, 17373.78190255200000000000, 17373.78190255220417633410
]
[ 8, 4, 0.00960079100000000000, 0.00960079113741758956 ]
[ 8, 5, 4.56673929500000000000, 4.56673929509287019456 ]
[ 8, 6, 0.79744134100000000000, 0.79744134113322314424 ]
[ 8, 7, -0.00090187100000000000, -0.00090187120721280172 ]
-[ 8, 9, -0.00300403500000000000, -0.00300403532938582735 ]
+[ 8, 9, -0.00300403500000000000, -0.00300403532938582735 ]
[ 9, 2, 0.72591434300000000000, 0.72591434384152961526 ]
[ 9, 3, -5783481.21694835700000000000, -5783481.21694835730858468677
]
[ 9, 4, -3.19596478800000000000, -3.19596478892958416484 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
