Changeset: 722249787a74 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=722249787a74
Added Files:
sql/test/configurable_rss/Tests/cap_rss_64.py.src
sql/test/configurable_rss/Tests/cap_rss_64.stable.err
sql/test/configurable_rss/Tests/cap_rss_64.stable.out
sql/test/configurable_rss/Tests/no_cap_rss_64.stable.err
sql/test/configurable_rss/Tests/no_cap_rss_64.stable.out
Removed Files:
sql/test/configurable_rss/Tests/cap_rss.stable.err
sql/test/configurable_rss/Tests/cap_rss.stable.out
sql/test/configurable_rss/Tests/cap_rss_64.py
sql/test/configurable_rss/Tests/no_cap_rss.stable.err
sql/test/configurable_rss/Tests/no_cap_rss.stable.out
Modified Files:
sql/test/configurable_rss/Tests/All
sql/test/configurable_rss/Tests/cap_rss.py
Branch: config_rss
Log Message:
Fix tests on 64 bits Windows.
diffs (truncated from 473 to 300 lines):
diff --git a/sql/test/configurable_rss/Tests/All
b/sql/test/configurable_rss/Tests/All
--- a/sql/test/configurable_rss/Tests/All
+++ b/sql/test/configurable_rss/Tests/All
@@ -1,4 +1,4 @@
-BITS64?NATIVE_WIN32?cap_rss_64
-BITS64?NATIVE_WIN32?no_cap_rss_64
-BITS32?NATIVE_WIN32?cap_rss_32
-BITS32?NATIVE_WIN32?no_cap_rss_32
+BITS64&NATIVE_WIN32?cap_rss_64
+BITS64&NATIVE_WIN32?no_cap_rss_64
+BITS32&NATIVE_WIN32?cap_rss_32
+BITS32&NATIVE_WIN32?no_cap_rss_32
diff --git a/sql/test/configurable_rss/Tests/cap_rss.py
b/sql/test/configurable_rss/Tests/cap_rss.py
--- a/sql/test/configurable_rss/Tests/cap_rss.py
+++ b/sql/test/configurable_rss/Tests/cap_rss.py
@@ -29,3 +29,5 @@ def main():
out, err = srv.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
+
+main()
diff --git a/sql/test/configurable_rss/Tests/cap_rss.stable.err
b/sql/test/configurable_rss/Tests/cap_rss.stable.err
deleted file mode 100644
--- a/sql/test/configurable_rss/Tests/cap_rss.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'cap_rss` in directory 'sql/test/configurable_rss` itself:
-
-
-# 20:34:03 >
-# 20:34:03 > "C:\Python27\python.exe" "cap_rss.py" "cap_rss"
-# 20:34:03 >
-
-#mserver: "--set gdk_mem_maxsize=70000000"
-#client:
"..\..\..\..\..\Sources\monetdb\sql\test\configurable_rss\Tests\push_and_check_rss.sql"
-# builtin opt gdk_dbpath =
C:\Users\aris\monetdb-installation\var\monetdb5\dbfarm\demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 32637
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss
-# cmdline opt gdk_mem_maxsize = 70000000
-# cmdline opt gdk_debug = 553648138
-
-# 20:34:21 >
-# 20:34:21 > "Done."
-# 20:34:21 >
-
diff --git a/sql/test/configurable_rss/Tests/cap_rss.stable.out
b/sql/test/configurable_rss/Tests/cap_rss.stable.out
deleted file mode 100644
--- a/sql/test/configurable_rss/Tests/cap_rss.stable.out
+++ /dev/null
@@ -1,82 +0,0 @@
-stdout of test 'cap_rss` in directory 'sql/test/configurable_rss` itself:
-
-
-# 20:34:03 >
-# 20:34:03 > "C:\Python27\python.exe" "cap_rss.py" "cap_rss"
-# 20:34:03 >
-
-#create function getrss()
-#returns bigint external name status.rss_cursize;
-#create function getvm()
-#returns bigint external name status.mem_cursize;
-#create table test(a int, b int, c double);
-#insert into test values (1, 0, 1);
-[ 1 ]
-#create procedure loop_insert(maximum_size bigint)
-#begin
-# declare size bigint;
-# set size = (select count(*) from test);
-#
-# while size < maximum_size do
-# insert into test (select a+1, b+2, rand()*c from test);
-#
-# set size = (select count(*) from test);
-# end while;
-#end;
-#select getrss() < 20000 as resident_set_size_is_less_then_20kbytes,
quantile(c/a, 0.8) from test;
-% .L2, sys.L6 # table_name
-% resident_set_size_is_less_then_20kbytes, L6 # name
-% boolean, double # type
-% 5, 24 # length
-[ true, 0 ]
-#drop table test cascade;
-#drop function getrss;
-# MonetDB 5 server v11.30.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_configurable_rss', using 2 threads
-# Compiled for x86_64-pc-winnt/64bit
-# Found 8.000 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://DESKTOP-J5OE0E3:32637/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 21_dependency_views.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 60_wlcr.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 97_comments.sql
-# loading sql script: 99_system.sql
-
-# 20:34:21 >
-# 20:34:21 > "Done."
-# 20:34:21 >
-
diff --git a/sql/test/configurable_rss/Tests/cap_rss_64.py
b/sql/test/configurable_rss/Tests/cap_rss_64.py.src
rename from sql/test/configurable_rss/Tests/cap_rss_64.py
rename to sql/test/configurable_rss/Tests/cap_rss_64.py.src
--- a/sql/test/configurable_rss/Tests/cap_rss_64.py
+++ b/sql/test/configurable_rss/Tests/cap_rss_64.py.src
@@ -1,4 +1,1 @@
-import cap_rss
-
-cap_rss.main()
-
+$RELSRCDIR/cap_rss.py
diff --git a/sql/test/configurable_rss/Tests/cap_rss_64.stable.err
b/sql/test/configurable_rss/Tests/cap_rss_64.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/configurable_rss/Tests/cap_rss_64.stable.err
@@ -0,0 +1,31 @@
+stderr of test 'cap_rss_64` in directory 'sql/test/configurable_rss` itself:
+
+
+# 16:57:17 >
+# 16:57:17 > "C:\Python27\python.exe" "cap_rss_64.py" "cap_rss_64"
+# 16:57:17 >
+
+#mserver: "--set gdk_mem_maxsize=20000000"
+#client:
"..\..\..\..\..\Sources\monetdb\sql\test\configurable_rss\Tests\push_and_check_rss.sql"
+# builtin opt gdk_dbpath =
C:\Users\aris\monetdb-installation\var\monetdb5\dbfarm\demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32503
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss
+# cmdline opt gdk_mem_maxsize = 20000000
+# cmdline opt gdk_debug = 553648138
+
+# 16:57:24 >
+# 16:57:24 > "Done."
+# 16:57:24 >
+
diff --git a/sql/test/configurable_rss/Tests/cap_rss_64.stable.out
b/sql/test/configurable_rss/Tests/cap_rss_64.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/configurable_rss/Tests/cap_rss_64.stable.out
@@ -0,0 +1,79 @@
+stdout of test 'cap_rss_64` in directory 'sql/test/configurable_rss` itself:
+
+
+# 16:57:17 >
+# 16:57:17 > "C:\Python27\python.exe" "cap_rss_64.py" "cap_rss_64"
+# 16:57:17 >
+
+#create function getrss()
+#returns bigint external name status.rss_cursize;
+#create table test(a int, b int, c double);
+#insert into test values (1, 0, 1);
+[ 1 ]
+#create procedure loop_insert(maximum_size bigint)
+#begin
+# declare size bigint;
+# set size = (select count(*) from test);
+#
+# while size < maximum_size do
+# insert into test (select a+1, b+2, rand()*c from test);
+#
+# set size = (select count(*) from test);
+# end while;
+#end;
+#select getrss() < 20000 as resident_set_size_is_less_then_20kbytes,
quantile(c/a, 0.8) * 0 from test;
+% .L2, sys.L6 # table_name
+% resident_set_size_is_less_then_20kbytes, L6 # name
+% boolean, double # type
+% 5, 24 # length
+[ true, 0 ]
+#drop table test cascade;
+#drop function getrss;
+# MonetDB 5 server v11.29.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_configurable_rss', using 2 threads
+# Compiled for x86_64-pc-winnt/64bit
+# Found 8.000 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://DESKTOP-J5OE0E3:32503/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 16:57:24 >
+# 16:57:24 > "Done."
+# 16:57:24 >
+
diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.stable.err
b/sql/test/configurable_rss/Tests/no_cap_rss.stable.err
deleted file mode 100644
--- a/sql/test/configurable_rss/Tests/no_cap_rss.stable.err
+++ /dev/null
@@ -1,33 +0,0 @@
-stderr of test 'no_cap_rss` in directory 'sql/test/configurable_rss` itself:
-
-
-# 20:52:50 >
-# 20:52:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31687" "--set" "monet_prompt="
"--forcemito"
"--dbpath=C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss"
-# 20:52:50 >
-
-# builtin opt gdk_dbpath =
C:\Users\aris\monetdb-installation\var\monetdb5\dbfarm\demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 31687
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
