Changeset: 4f6f86dbf03b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f6f86dbf03b
Branch: mtest
Log Message:
merged
diffs (94 lines):
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
deleted file mode 100644
--- a/clients/Tests/MAL-signatures.test
+++ /dev/null
@@ -1,6 +0,0 @@
-query TTTTT rowsort
-select * from sys.malfunctions() order by module, "function", address,
signature, comment
-----
-65520 values hashing to 3abd7dc63f82fc485bf8bfcf1b2af07e
-
-
diff --git a/clients/Tests/exports.py b/clients/Tests/exports.py
--- a/clients/Tests/exports.py
+++ b/clients/Tests/exports.py
@@ -1,2 +1,7 @@
+import sys
+import difflib
import MonetDBtesting.listexports
-MonetDBtesting.listexports.main()
+output = MonetDBtesting.listexports.listexports()
+stable = open('exports.stable.out').readlines()
+for line in difflib.unified_diff(stable, output):
+ sys.stderr.write(line)
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1,10 +1,3 @@
-stdout of test 'exports` in directory 'clients` itself:
-
-
-# 21:40:57 >
-# 21:40:57 > "/usr/bin/python2" "exports.py" "exports"
-# 21:40:57 >
-
# gdk
int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMallocate(const char *nme);
@@ -668,7 +661,6 @@ MapiMsg mapi_set_size_header(Mapi mid, b
MapiMsg mapi_set_timeout(Mapi mid, unsigned int timeout, bool (*callback)(void
*), void *callback_data) __attribute__((__nonnull__(1)));
void mapi_setfilecallback(Mapi mid, char *(*getfunc)(void *priv, const char
*filename, bool binary, uint64_t offset, size_t *size), char *(*putfunc)(void
*priv, const char *filename, const void *data, size_t size), void *priv)
__attribute__((__nonnull__(1)));
int mapi_split_line(MapiHdl hdl) __attribute__((__nonnull__(1)));
-
MapiMsg mapi_store_field(MapiHdl hdl, int fnr, int outtype, void *outparam)
__attribute__((__nonnull__(1)));
MapiMsg mapi_timeout(Mapi mid, unsigned int time)
__attribute__((__nonnull__(1)));
void mapi_trace(Mapi mid, bool flag) __attribute__((__nonnull__(1)));
@@ -1784,8 +1776,3 @@ stream *stream_blackhole_create(void);
stream *stream_fwf_create(stream *restrict s, size_t num_fields, size_t
*restrict widths, char filler);
stream *xz_stream(stream *inner, int preset);
-
-# 21:41:06 >
-# 21:41:06 > "Done."
-# 21:41:06 >
-
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1282,6 +1282,7 @@ def PerformDir(env, testdir, testlist, B
os.environ['TSTSRCDIR'] = TSTSRCDIR
os.environ['TSTTRGDIR'] = TSTTRGDIR
os.environ['RELSRCDIR'] = env['RELSRCDIR']
+ os.environ['HAVE_HGE'] = CONDITIONALS['HAVE_HGE']
if 'TSTDATAPATH' not in os.environ and TSTDATAPATH:
env['TSTDATAPATH'] = TSTDATAPATH
os.environ['TSTDATAPATH'] = TSTDATAPATH
diff --git a/testing/listexports.py.in b/testing/listexports.py.in
--- a/testing/listexports.py.in
+++ b/testing/listexports.py.in
@@ -85,16 +85,20 @@ def findfiles(dirlist, skipfiles = [], s
names, decls = list(zip(*decls))
return decls
-def main():
+def listexports():
+ output = []
for lib in libs:
dirs = dirlist[lib]
dl = [os.path.join(srcdir, d) for d in dirs]
decls = findfiles(dl, skipfiles = skipfiles, skipdirs = skipdirs)
- sys.stdout.write('# %s\n' % lib)
+ output.append('# %s\n' % lib)
for d in decls:
- sys.stdout.write(d)
- sys.stdout.write('\n')
- sys.stdout.write('\n')
+ output.append(d + '\n')
+ output.append('\n')
+ return output
+
+def main():
+ sys.stdout.writelines(listexports())
if __name__ == '__main__':
main()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
