Changeset: ade667955950 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ade667955950
Added Files:
clients/Tests/exports.stable.err-noapprove
clients/Tests/malcheck.stable.err-noapprove
clients/Tests/malcheck.stable.out-noapprove
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/malcheck.stable.out
monetdb5/optimizer/optimizer.mal
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (109 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -7942,7 +7942,6 @@ Ready.
[ "mdb", "start", "pattern mdb.start(clientid:int):void ",
"MDBstart;", "Start interactive debugger on a client" ]
[ "mdb", "start", "pattern mdb.start(mod:str, fcn:str):void ",
"MDBstartFactory;", "Start interactive debugger on a running factory"
]
[ "mdb", "stop", "pattern mdb.stop():void ", "MDBstop;", "Stop
the interactive debugger" ]
-[ "mdb", "traceOptimizer", "command
mdb.traceOptimizer(flg:str):void ", "OPTsetDebugStr;", "Otherwise it is
considered a request to trace the optimizers,\nwhich requires a comma separated
list or pipeline name." ]
[ "mdb", "var", "pattern mdb.var(M:str, F:str):void ", "MDBvar3;",
"Dump the symboltable of routine M.F on standard out." ]
[ "mdb", "var", "pattern mdb.var():void ", "MDBvar;", "Dump
the symboltable of current routine on standard out." ]
[ "mkey", "bulk_rotate_xor_hash", "command
mkey.bulk_rotate_xor_hash(h:bat[:lng], nbits:int, b:bat[:any_1]):bat[:lng] ",
"MKEYbulk_rotate_xor_hash;", "pre: h and b should be synced on head\n
post: [:xor=]([:rotate=](h, nbits), [hash](b))" ]
@@ -7970,7 +7969,7 @@ Ready.
[ "mmath", "cbrt", "command mmath.cbrt(y:flt):flt ",
"MATHunary_CBRTflt;", "" ]
[ "mmath", "ceil", "command mmath.ceil(y:dbl):dbl ",
"MATHunary_CEILdbl;", "The ceil(x) function rounds x upwards to the nearest
integer." ]
[ "mmath", "ceil", "command mmath.ceil(y:flt):flt ",
"MATHunary_CEILflt;", "" ]
-[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
+[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the cube root of x."
]
[ "mmath", "cos", "command mmath.cos(x:dbl):dbl ",
"MATHunary_COSdbl;", "The cos(x) function returns the cosine of x, where x
is given in \n radians. The return value is between -1 and 1." ]
[ "mmath", "cos", "command mmath.cos(x:flt):flt ",
"MATHunary_COSflt;", "" ]
[ "mmath", "cosh", "command mmath.cosh(x:dbl):dbl ",
"MATHunary_COSHdbl;", "The cosh() function returns the hyperbolic cosine of
x, which is \n\tdefined mathematically as (exp(x) + exp(-x)) / 2." ]
@@ -8007,7 +8006,7 @@ Ready.
[ "mmath", "sinh", "command mmath.sinh(x:dbl):dbl ",
"MATHunary_SINHdbl;", "The sinh() function returns the hyperbolic sine of
x, which \n is defined mathematically as (exp(x) - exp(-x)) / 2." ]
[ "mmath", "sinh", "command mmath.sinh(x:flt):flt ",
"MATHunary_SINHflt;", "" ]
[ "mmath", "sqlrand", "command mmath.sqlrand(seed:int):int ",
"MATHsqlrandint;", "initialize the rand() function with a seed and call
rand()" ]
-[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
+[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The sqrt(x) function returns the non-negative root of
x." ]
[ "mmath", "sqrt", "command mmath.sqrt(y:flt):flt ",
"MATHunary_SQRTflt;", "" ]
[ "mmath", "srand", "command mmath.srand(seed:int):void ",
"MATHsrandint;", "initialize the rand() function with a seed" ]
[ "mmath", "tan", "command mmath.tan(x:dbl):dbl ",
"MATHunary_TANdbl;", "The tan(x) function returns the tangent of x,\n
where x is given in radians" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -10303,7 +10303,6 @@ Ready.
[ "mdb", "start", "pattern mdb.start(clientid:int):void ",
"MDBstart;", "Start interactive debugger on a client" ]
[ "mdb", "start", "pattern mdb.start(mod:str, fcn:str):void ",
"MDBstartFactory;", "Start interactive debugger on a running factory"
]
[ "mdb", "stop", "pattern mdb.stop():void ", "MDBstop;", "Stop
the interactive debugger" ]
-[ "mdb", "traceOptimizer", "command
mdb.traceOptimizer(flg:str):void ", "OPTsetDebugStr;", "Otherwise it is
considered a request to trace the optimizers,\nwhich requires a comma separated
list or pipeline name." ]
[ "mdb", "var", "pattern mdb.var(M:str, F:str):void ", "MDBvar3;",
"Dump the symboltable of routine M.F on standard out." ]
[ "mdb", "var", "pattern mdb.var():void ", "MDBvar;", "Dump
the symboltable of current routine on standard out." ]
[ "mkey", "bulk_rotate_xor_hash", "command
mkey.bulk_rotate_xor_hash(h:bat[:lng], nbits:int, b:bat[:any_1]):bat[:lng] ",
"MKEYbulk_rotate_xor_hash;", "pre: h and b should be synced on head\n
post: [:xor=]([:rotate=](h, nbits), [hash](b))" ]
@@ -10332,7 +10331,7 @@ Ready.
[ "mmath", "cbrt", "command mmath.cbrt(y:flt):flt ",
"MATHunary_CBRTflt;", "" ]
[ "mmath", "ceil", "command mmath.ceil(y:dbl):dbl ",
"MATHunary_CEILdbl;", "The ceil(x) function rounds x upwards to the nearest
integer." ]
[ "mmath", "ceil", "command mmath.ceil(y:flt):flt ",
"MATHunary_CEILflt;", "" ]
-[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
+[ "mmath", "cnrt", "command mmath.cnrt(y:dbl):dbl ",
"MATHunary_CBRTdbl;", "The cbrt(x) function returns the cube root of x."
]
[ "mmath", "cos", "command mmath.cos(x:dbl):dbl ",
"MATHunary_COSdbl;", "The cos(x) function returns the cosine of x, where x
is given in \n radians. The return value is between -1 and 1." ]
[ "mmath", "cos", "command mmath.cos(x:flt):flt ",
"MATHunary_COSflt;", "" ]
[ "mmath", "cosh", "command mmath.cosh(x:dbl):dbl ",
"MATHunary_COSHdbl;", "The cosh() function returns the hyperbolic cosine of
x, which is \n\tdefined mathematically as (exp(x) + exp(-x)) / 2." ]
@@ -10369,7 +10368,7 @@ Ready.
[ "mmath", "sinh", "command mmath.sinh(x:dbl):dbl ",
"MATHunary_SINHdbl;", "The sinh() function returns the hyperbolic sine of
x, which \n is defined mathematically as (exp(x) - exp(-x)) / 2." ]
[ "mmath", "sinh", "command mmath.sinh(x:flt):flt ",
"MATHunary_SINHflt;", "" ]
[ "mmath", "sqlrand", "command mmath.sqlrand(seed:int):int ",
"MATHsqlrandint;", "initialize the rand() function with a seed and call
rand()" ]
-[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The cbrt(x) function returns the non-negative cube
root of x." ]
+[ "mmath", "sqrt", "command mmath.sqrt(y:dbl):dbl ",
"MATHunary_SQRTdbl;", "The sqrt(x) function returns the non-negative root of
x." ]
[ "mmath", "sqrt", "command mmath.sqrt(y:flt):flt ",
"MATHunary_SQRTflt;", "" ]
[ "mmath", "srand", "command mmath.srand(seed:int):void ",
"MATHsrandint;", "initialize the rand() function with a seed" ]
[ "mmath", "tan", "command mmath.tan(x:dbl):dbl ",
"MATHunary_TANdbl;", "The tan(x) function returns the tangent of x,\n
where x is given in radians" ]
diff --git a/clients/Tests/exports.stable.err-noapprove
b/clients/Tests/exports.stable.err-noapprove
new file mode 100644
diff --git a/clients/Tests/malcheck.stable.err-noapprove
b/clients/Tests/malcheck.stable.err-noapprove
new file mode 100644
diff --git a/clients/Tests/malcheck.stable.out
b/clients/Tests/malcheck.stable.out
--- a/clients/Tests/malcheck.stable.out
+++ b/clients/Tests/malcheck.stable.out
@@ -5,7 +5,6 @@ stdout of test 'malcheck` in directory '
# 15:15:51 > "./malcheck.sh" "malcheck"
# 15:15:51 >
-OPTsetDebugStr: missing for MAL command mdb.traceOptimizer in
monetdb5/optimizer/optimizer.mal
# 15:16:26 >
# 15:16:26 > "Done."
diff --git a/clients/Tests/malcheck.stable.out-noapprove
b/clients/Tests/malcheck.stable.out-noapprove
new file mode 100644
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -298,13 +298,6 @@ address QOTgetStatistics
comment "Get optimizer property statistics
such as #calls, #total actions, #total time";
-#opt_support.mal
-
-command mdb.traceOptimizer(flg:str)
-address OPTsetDebugStr
-comment "Otherwise it is considered a request to trace the optimizers,
-which requires a comma separated list or pipeline name.";
-
#opt_trace.mal
pattern optimizer.trace():str
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1374,6 +1374,13 @@ def ApproveOutput (env, TST) :
proc.wait()
f.close()
if os.path.getsize(patch + ".0"):
+ # if a file TST.stable.{out,err}-noapprove exists, we
+ # refuse to approve the output by (silently) skipping
+ if os.path.isfile(TSTSRCDIRTST + '.stable.' + WHAT +
'-noapprove'):
+ remove(patch + ".0")
+ if verbose:
+ print("NOT approving %s -> stable.%s%s" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM))
+ continue
if not verbose:
oc = ''
print("Approving %s -> stable.%s%s%s" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM, oc))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
