Changeset: d63389dd8810 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d63389dd8810
Added Files:
        sql/test/configurable_rss/Tests/All
        sql/test/configurable_rss/Tests/cap_rss.py
        sql/test/configurable_rss/Tests/push_and_check_rss.sql
Removed Files:
        gdk/Tests/All
        gdk/Tests/caprss.py
        gdk/Tests/push_and_check_rss.sql
Modified Files:
        .vscode/run_tests.bat
Branch: configurable_working_set
Log Message:

Move tests to a better home and adjust them to existing status module.


diffs (53 lines):

diff --git a/.vscode/run_tests.bat b/.vscode/run_tests.bat
--- a/.vscode/run_tests.bat
+++ b/.vscode/run_tests.bat
@@ -1,6 +1,6 @@
 rem call environment variables for Monetdb compilation and runtime
 call %~dp0/monetdb-environment.bat
 
-cd %SOURCE%\gdk\Tests
+cd %SOURCE%\sql\test\configurable_rss\Tests
 
 Mtest.py
diff --git a/gdk/Tests/All b/sql/test/configurable_rss/Tests/All
rename from gdk/Tests/All
rename to sql/test/configurable_rss/Tests/All
--- a/gdk/Tests/All
+++ b/sql/test/configurable_rss/Tests/All
@@ -1,1 +1,1 @@
-caprss
+cap_rss
diff --git a/gdk/Tests/caprss.py b/sql/test/configurable_rss/Tests/cap_rss.py
rename from gdk/Tests/caprss.py
rename to sql/test/configurable_rss/Tests/cap_rss.py
--- a/gdk/Tests/caprss.py
+++ b/sql/test/configurable_rss/Tests/cap_rss.py
@@ -21,12 +21,6 @@ def client(lang, file):
 def main():
     srv = server_start(["--set", "gdk_mem_maxsize=70000000"])
 
-    out, err = client('MAL',
-                      os.path.join(os.getenv('RELSRCDIR'),
-                                   'prologue.mal'))
-    sys.stdout.write(out)
-    sys.stderr.write(err)
-
     out, err = client('SQL',
                       os.path.join(os.getenv('RELSRCDIR'),
                                    'push_and_check_rss.sql'))
diff --git a/gdk/Tests/push_and_check_rss.sql 
b/sql/test/configurable_rss/Tests/push_and_check_rss.sql
rename from gdk/Tests/push_and_check_rss.sql
rename to sql/test/configurable_rss/Tests/push_and_check_rss.sql
--- a/gdk/Tests/push_and_check_rss.sql
+++ b/sql/test/configurable_rss/Tests/push_and_check_rss.sql
@@ -1,8 +1,8 @@
 create function getrss() 
-returns BIGINT external name prologue.getrss;
+returns BIGINT external name status.rss_cursize;
 
 create function getvm() 
-returns BIGINT external name prologue.getvm;
+returns BIGINT external name status.mem_cursize;
 
 create table test(a int, b int, c double);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to