Changeset: fe24e64159db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe24e64159db
Modified Files:
sql/backends/monet5/Makefile.ag
sql/test/configurable_rss/Tests/rss.py
Branch: config_rss
Log Message:
Fix .ag and python file.
diffs (24 lines):
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-SUBDIRS = NOT_WIN32?vaults UDF generator HAVE_TESTING&WIN32?config_rss
+SUBDIRS = NOT_WIN32?vaults UDF generator HAVE_TESTING?WIN32?config_rss
INCLUDES = ../../include ../../common ../../storage ../../server \
../../../monetdb5/modules/atoms \
diff --git a/sql/test/configurable_rss/Tests/rss.py
b/sql/test/configurable_rss/Tests/rss.py
--- a/sql/test/configurable_rss/Tests/rss.py
+++ b/sql/test/configurable_rss/Tests/rss.py
@@ -20,7 +20,7 @@ drop function test_rss;
self.rss_max_in_Bytes = 30000000
def prepare_server_options(self):
- return ["--set", "gdk_mem_maxsize={}".format(self.rss_max_in_Bytes)]
if self.is_capped else []
+ return ["--set", "gdk_mem_maxsize={}".format(self.rss_max_in_Bytes)]
def prepare_sql_script(self):
return
RSSTestConfig.sql_template.format(gdk_mem_maxsize=self.rss_max_in_Bytes)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
