Changeset: d91089635868 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d91089635868 Added Files: clients/Tests/SQL-dump_gsl.sql.src clients/Tests/SQL-dump_gsl.stable.err clients/Tests/SQL-dump_gsl.stable.out Modified Files: clients/Tests/All Branch: Jan2014 Log Message:
Created SQL-dump test specific for when the GSL library is present. Also, the other SQL-dump test should not run when the GSL library is not present. diffs (truncated from 8480 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -3,5 +3,6 @@ HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIEN HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL?MAL-signatures_gsl HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT&!HAVE_GSL?MAL-signatures_sphinxclient !HAVE_CFITSIO&HAVE_GEOM&!HAVE_SPHINXCLIENT&!HAVE_GSL?MAL-signatures_nocfitsio -HAVE_GEOM?SQL-dump -!HAVE_GEOM?SQL-dump_nogeom +HAVE_GEOM&!HAVE_GSL?SQL-dump +HAVE_GEOM&HAVE_GSL?SQL-dump_gsl +!HAVE_GEOM&!HAVE_GSL?SQL-dump_nogeom diff --git a/clients/Tests/SQL-dump_gsl.sql.src b/clients/Tests/SQL-dump_gsl.sql.src new file mode 100644 --- /dev/null +++ b/clients/Tests/SQL-dump_gsl.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/SQL-dump.sql diff --git a/clients/Tests/SQL-dump_gsl.stable.err b/clients/Tests/SQL-dump_gsl.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/SQL-dump_gsl.stable.err @@ -0,0 +1,35 @@ +stderr of test 'SQL-dump_gsl` in directory 'clients` itself: + + +# 15:01:36 > +# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34237" "--set" "mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=0" +# 15:01:36 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = yes +# 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 = 34237 +# cmdline opt mapi_usock = /var/tmp/mtest-13451/.s.monetdb.34237 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients +# cmdline opt mal_listing = 0 + +# 15:01:36 > +# 15:01:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13451" "--port=34237" +# 15:01:36 > + + +# 15:01:41 > +# 15:01:41 > "Done." +# 15:01:41 > + diff --git a/clients/Tests/SQL-dump_gsl.stable.out b/clients/Tests/SQL-dump_gsl.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/SQL-dump_gsl.stable.out @@ -0,0 +1,8417 @@ +stdout of test 'SQL-dump_gsl` in directory 'clients` itself: + + +# 15:01:36 > +# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34237" "--set" "mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=0" +# 15:01:36 > + +# MonetDB 5 server v11.17.0 (hg id: 51cced809df4) +# This is an unreleased version +# Serving database 'mTests_clients', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.591 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:34237/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13451/.s.monetdb.34237 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. +# 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_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 41_jsonstore.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql +#Bulk operator required for str.stringleft +#Bulk operator required for str.stringleft + +# 15:01:36 > +# 15:01:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13451" "--port=34237" +# 15:01:36 > + +SCHEMA tmp +SCHEMA tmp +SYSTEM SCHEMA sys +SYSTEM TABLE sys._columns +SYSTEM TABLE sys._tables +SYSTEM TABLE sys.args +SYSTEM TABLE sys.auths +SYSTEM TABLE sys.connections +SYSTEM TABLE sys.db_user_info +SYSTEM TABLE sys.dependencies +SYSTEM TABLE sys.functions +SYSTEM TABLE sys.idxs +SYSTEM TABLE sys.keys +SYSTEM TABLE sys.objects +SYSTEM TABLE sys.privileges +SYSTEM TABLE sys.schemas +SYSTEM TABLE sys.sequences +SYSTEM TABLE sys.statistics +SYSTEM TABLE sys.storagemodelinput +SYSTEM TABLE sys.systemfunctions +SYSTEM TABLE sys.triggers +SYSTEM TABLE sys.types +SYSTEM TABLE sys.user_role +SYSTEM VIEW sys.columns +SYSTEM VIEW sys.environment +SYSTEM VIEW sys.optimizers +SYSTEM VIEW sys.querylog_calls +SYSTEM VIEW sys.querylog_catalog +SYSTEM VIEW sys.querylog_history +SYSTEM VIEW sys.queue +SYSTEM VIEW sys.sessions +SYSTEM VIEW sys.storage +SYSTEM VIEW sys.storagemodel +SYSTEM VIEW sys.tables +SYSTEM VIEW sys.tablestoragemodel +SYSTEM VIEW sys.tracelog +SYSTEM VIEW sys.users +SYSTEM FUNCTION sys.Intersect +SYSTEM FUNCTION sys.Union +SYSTEM FUNCTION sys.abbrev +SYSTEM FUNCTION sys.alpha +SYSTEM FUNCTION sys.analyze +SYSTEM FUNCTION sys.area +SYSTEM FUNCTION sys.astext +SYSTEM FUNCTION sys.bbp +SYSTEM FUNCTION sys.boundary +SYSTEM FUNCTION sys.broadcast +SYSTEM FUNCTION sys.buffer +SYSTEM FUNCTION sys.chi2prob +SYSTEM FUNCTION sys.cluster1 +SYSTEM FUNCTION sys.cluster2 +SYSTEM FUNCTION sys.columnsize +SYSTEM FUNCTION sys.contains +SYSTEM FUNCTION sys.convexhull +SYSTEM FUNCTION sys.corr +SYSTEM FUNCTION sys.crosses +SYSTEM FUNCTION sys.date_to_str +SYSTEM FUNCTION sys.db_users +SYSTEM FUNCTION sys.degrees +SYSTEM FUNCTION sys.dependencies_columns_on_functions +SYSTEM FUNCTION sys.dependencies_columns_on_indexes +SYSTEM FUNCTION sys.dependencies_columns_on_keys +SYSTEM FUNCTION sys.dependencies_columns_on_triggers +SYSTEM FUNCTION sys.dependencies_columns_on_views +SYSTEM FUNCTION sys.dependencies_functions_on_functions +SYSTEM FUNCTION sys.dependencies_functions_os_triggers +SYSTEM FUNCTION sys.dependencies_keys_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_owners_on_schemas +SYSTEM FUNCTION sys.dependencies_schemas_on_users +SYSTEM FUNCTION sys.dependencies_tables_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_tables_on_functions +SYSTEM FUNCTION sys.dependencies_tables_on_indexes +SYSTEM FUNCTION sys.dependencies_tables_on_triggers +SYSTEM FUNCTION sys.dependencies_tables_on_views +SYSTEM FUNCTION sys.dependencies_views_on_functions +SYSTEM FUNCTION sys.dependencies_views_on_triggers +SYSTEM FUNCTION sys.difference +SYSTEM FUNCTION sys.dimension +SYSTEM FUNCTION sys.disjoint +SYSTEM FUNCTION sys.distance +SYSTEM FUNCTION sys.dropdictionary +SYSTEM FUNCTION sys.env +SYSTEM FUNCTION sys.envelope +SYSTEM FUNCTION sys.environment +SYSTEM FUNCTION sys.equals +SYSTEM FUNCTION sys.evalalgebra +SYSTEM FUNCTION sys.fuse +SYSTEM FUNCTION sys.geomcollectionfromtext +SYSTEM FUNCTION sys.geometrytypeid +SYSTEM FUNCTION sys.geomfromtext +SYSTEM FUNCTION sys.getanchor +SYSTEM FUNCTION sys.getbasename +SYSTEM FUNCTION sys.getcontent +SYSTEM FUNCTION sys.getcontext +SYSTEM FUNCTION sys.getdomain +SYSTEM FUNCTION sys.getextension +SYSTEM FUNCTION sys.getfile +SYSTEM FUNCTION sys.gethost +SYSTEM FUNCTION sys.getport +SYSTEM FUNCTION sys.getprotocol +SYSTEM FUNCTION sys.getquery +SYSTEM FUNCTION sys.getroboturl +SYSTEM FUNCTION sys.getuser +SYSTEM FUNCTION sys.gzcompress +SYSTEM FUNCTION sys.gzdecompress +SYSTEM FUNCTION sys.gzexpand +SYSTEM FUNCTION sys.gztruncate +SYSTEM FUNCTION sys.heapsize +SYSTEM FUNCTION sys.host +SYSTEM FUNCTION sys.hostmask +SYSTEM FUNCTION sys.ilike +SYSTEM FUNCTION sys.indexsize +SYSTEM FUNCTION sys.initializedictionary +SYSTEM FUNCTION sys.intersection +SYSTEM FUNCTION sys.isaurl +SYSTEM FUNCTION sys.isauuid +SYSTEM FUNCTION sys.isempty +SYSTEM FUNCTION sys.issimple +SYSTEM FUNCTION sys.json_filter +SYSTEM FUNCTION sys.json_filter_all +SYSTEM FUNCTION sys.json_isvalid +SYSTEM FUNCTION sys.json_isvalidarray +SYSTEM FUNCTION sys.json_isvalidobject +SYSTEM FUNCTION sys.json_length +SYSTEM FUNCTION sys.json_path +SYSTEM FUNCTION sys.json_text +SYSTEM FUNCTION sys.length +SYSTEM FUNCTION sys.like +SYSTEM FUNCTION sys.linefromtext +SYSTEM FUNCTION sys.masklen +SYSTEM FUNCTION sys.mbr +SYSTEM FUNCTION sys.mbroverlaps +SYSTEM FUNCTION sys.md5 +SYSTEM FUNCTION sys.median +SYSTEM FUNCTION sys.mlinefromtext +SYSTEM FUNCTION sys.mpointfromtext +SYSTEM FUNCTION sys.mpolyfromtext +SYSTEM FUNCTION sys.ms_round +SYSTEM FUNCTION sys.ms_str +SYSTEM FUNCTION sys.ms_stuff +SYSTEM FUNCTION sys.ms_trunc +SYSTEM FUNCTION sys.netmask +SYSTEM FUNCTION sys.network +SYSTEM FUNCTION sys.newdictionary +SYSTEM FUNCTION sys.newurl +SYSTEM FUNCTION sys.optimizer_stats +SYSTEM FUNCTION sys.optimizers +SYSTEM FUNCTION sys.overlaps +SYSTEM FUNCTION sys.password_hash +SYSTEM FUNCTION sys.pause +SYSTEM FUNCTION sys.point +SYSTEM FUNCTION sys.pointfromtext +SYSTEM FUNCTION sys.polyfromtext +SYSTEM FUNCTION sys.polygonfromtext +SYSTEM FUNCTION sys.quantile +SYSTEM FUNCTION sys.querycache +SYSTEM FUNCTION sys.querylog +SYSTEM FUNCTION sys.querylog_calls +SYSTEM FUNCTION sys.querylog_catalog +SYSTEM FUNCTION sys.querylog_disable +SYSTEM FUNCTION sys.querylog_empty +SYSTEM FUNCTION sys.querylog_enable +SYSTEM FUNCTION sys.queue +SYSTEM FUNCTION sys.radians +SYSTEM FUNCTION sys.relate +SYSTEM FUNCTION sys.resume +SYSTEM FUNCTION sys.reuse +SYSTEM FUNCTION sys.reverse +SYSTEM FUNCTION sys.sessions +SYSTEM FUNCTION sys.setmasklen +SYSTEM FUNCTION sys.setsession +SYSTEM FUNCTION sys.settimeout +SYSTEM FUNCTION sys.shrink +SYSTEM FUNCTION sys.shutdown +SYSTEM FUNCTION sys.srid +SYSTEM FUNCTION sys.stddev_pop +SYSTEM FUNCTION sys.stddev_samp +SYSTEM FUNCTION sys.stop +SYSTEM FUNCTION sys.storage _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
