Changeset: 57cf4df838f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57cf4df838f9
Modified Files:
clients/Tests/exports.stable.out
sql/test/mapi/Tests/utf8test.stable.err
Branch: makelibstreamgreatagain
Log Message:
Approve
diffs (135 lines):
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
@@ -2263,10 +2263,8 @@ stream *callback_stream(void *restrict p
void close_stream(stream *s);
stream *compressed_stream(stream *inner, int preset);
stream *create_text_stream(stream *s);
-stream *file_rastream(FILE *restrict fp, const char *restrict name);
-stream *file_rstream(FILE *restrict fp, const char *restrict name);
-stream *file_wastream(FILE *restrict fp, const char *restrict name);
-stream *file_wstream(FILE *restrict fp, const char *restrict name);
+stream *file_rstream(FILE *restrict fp, bool binary, const char *restrict
name);
+stream *file_wstream(FILE *restrict fp, bool binary, const char *restrict
name);
FILE *getFile(stream *s);
int getFileNo(stream *s);
size_t getFileSize(stream *s);
@@ -2332,6 +2330,9 @@ stream *open_wastream(const char *filena
stream *open_wstream(const char *filename);
stream *socket_rstream(SOCKET socket, const char *name);
stream *socket_wstream(SOCKET socket, const char *name);
+stream *stderr_wastream(void);
+stream *stdin_rastream(void);
+stream *stdout_wastream(void);
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);
diff --git a/sql/test/mapi/Tests/utf8test.stable.err
b/sql/test/mapi/Tests/utf8test.stable.err
--- a/sql/test/mapi/Tests/utf8test.stable.err
+++ b/sql/test/mapi/Tests/utf8test.stable.err
@@ -1,89 +1,22 @@
stderr of test 'utf8test` in directory 'sql/test/mapi` itself:
-# 10:26:27 >
-# 10:26:27 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set
"sql_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/sql_logs"
--set
"xquery_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=32641 --set
xrpc_port=40706 --set monet_prompt= --trace "--dbname=mTests_src_test_mapi"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 10:26:27 >
+# 15:07:06 >
+# 15:07:06 > "/home/jvr/lib/pyenv/versions/3.7.5/bin/python3.7"
"utf8test.SQL.py" "utf8test"
+# 15:07:06 >
+
+
+
+
+
+
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.24.1
-# builtin opt monet_pid = 4008
-# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB:${prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB/sql_logs
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB/xquery_logs
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 15
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config = /ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf
-# cmdline opt monet_mod_path =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm
-# cmdline opt sql_logdir =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/sql_logs
-# cmdline opt xquery_logdir =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/xquery_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 32641
-# cmdline opt xrpc_port = 40706
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_mapi
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf)
+
+write error: stream stdout: invalid multibyte sequence
+write error: stream stdout: invalid multibyte sequence
+
-# 11:32:43 >
-# 11:32:43 > /usr/bin/python utf8test.SQL.py utf8test
-# 11:32:43 >
+# 15:07:07 >
+# 15:07:07 > "Done."
+# 15:07:07 >
-write error
-write error
-
-# 11:32:43 >
-# 11:32:43 > Done.
-# 11:32:43 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
