Changeset: bec0fb76305a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bec0fb76305a Added Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 Removed Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.malC.src clients/Tests/MAL-signatures_nocfitsio.stable.err clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump.timeout clients/Tests/SQL-dump_all.sql.src Modified Files: clients/Tests/All clients/Tests/MAL-signatures_none.malC.src clients/Tests/SQL-dump_none.sql.src Branch: Jan2014 Log Message:
clients/Tests: renamed and cleaned-up test variants to only have (to maintain) those variants that are actually used by our nightly testing systems diffs (truncated from 43191 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,9 +1,8 @@ exports -HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures -HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures_gsl -!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_SPHINXCLIENT?MAL-signatures_all +HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures_fits_geom +!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures_geom !HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_SPHINXCLIENT?MAL-signatures_none -HAVE_GEOM&!HAVE_GSL?SQL-dump HAVE_GEOM&HAVE_GSL?SQL-dump_all +HAVE_GEOM&!HAVE_GSL?SQL-dump_geom !HAVE_GEOM&!HAVE_GSL?SQL-dump_none diff --git a/clients/Tests/MAL-signatures.malC b/clients/Tests/MAL-signatures_all.malC rename from clients/Tests/MAL-signatures.malC rename to clients/Tests/MAL-signatures_all.malC diff --git a/clients/Tests/MAL-signatures_all.malC.src b/clients/Tests/MAL-signatures_fits_geom.malC.src rename from clients/Tests/MAL-signatures_all.malC.src rename to clients/Tests/MAL-signatures_fits_geom.malC.src --- a/clients/Tests/MAL-signatures_all.malC.src +++ b/clients/Tests/MAL-signatures_fits_geom.malC.src @@ -1,1 +1,1 @@ -$RELSRCDIR/MAL-signatures.malC +$RELSRCDIR/MAL-signatures_all.malC diff --git a/clients/Tests/MAL-signatures.stable.err b/clients/Tests/MAL-signatures_fits_geom.stable.err rename from clients/Tests/MAL-signatures.stable.err rename to clients/Tests/MAL-signatures_fits_geom.stable.err --- a/clients/Tests/MAL-signatures.stable.err +++ b/clients/Tests/MAL-signatures_fits_geom.stable.err @@ -1,4 +1,4 @@ -stderr of test 'MAL-signatures` in directory 'clients` itself: +stderr of test 'MAL-signatures_fits_geom` in directory 'clients` itself: # 14:24:10 > diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out rename from clients/Tests/MAL-signatures.stable.out rename to clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -1,4 +1,4 @@ -stdout of test 'MAL-signatures` in directory 'clients` itself: +stdout of test 'MAL-signatures_fits_geom` in directory 'clients` itself: # 14:24:10 > diff --git a/clients/Tests/MAL-signatures_nocfitsio.malC.src b/clients/Tests/MAL-signatures_geom.malC.src rename from clients/Tests/MAL-signatures_nocfitsio.malC.src rename to clients/Tests/MAL-signatures_geom.malC.src --- a/clients/Tests/MAL-signatures_nocfitsio.malC.src +++ b/clients/Tests/MAL-signatures_geom.malC.src @@ -1,1 +1,1 @@ -$RELSRCDIR/MAL-signatures.malC +$RELSRCDIR/MAL-signatures_all.malC diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.err b/clients/Tests/MAL-signatures_geom.stable.err rename from clients/Tests/MAL-signatures_nocfitsio.stable.err rename to clients/Tests/MAL-signatures_geom.stable.err --- a/clients/Tests/MAL-signatures_nocfitsio.stable.err +++ b/clients/Tests/MAL-signatures_geom.stable.err @@ -1,4 +1,4 @@ -stderr of test 'MAL-signatures_nocfitsio` in directory 'clients` itself: +stderr of test 'MAL-signatures_geom` in directory 'clients` itself: # 14:24:10 > diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_geom.stable.out rename from clients/Tests/MAL-signatures_nocfitsio.stable.out rename to clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -1,4 +1,4 @@ -stdout of test 'MAL-signatures_nocfitsio` in directory 'clients` itself: +stdout of test 'MAL-signatures_geom` in directory 'clients` itself: # 14:24:10 > diff --git a/clients/Tests/MAL-signatures_gsl.malC.src b/clients/Tests/MAL-signatures_gsl.malC.src deleted file mode 100644 --- a/clients/Tests/MAL-signatures_gsl.malC.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_gsl.stable.err b/clients/Tests/MAL-signatures_gsl.stable.err deleted file mode 100644 --- a/clients/Tests/MAL-signatures_gsl.stable.err +++ /dev/null @@ -1,35 +0,0 @@ -stderr of test 'MAL-signatures_gsl` in directory 'clients` itself: - - -# 14:24:10 > -# 14:24:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31236" "--set" "mapi_usock=/var/tmp/mtest-21213/.s.monetdb.31236" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=2" -# 14:24:10 > - -# 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 = 31236 -# cmdline opt mapi_usock = /var/tmp/mtest-21213/.s.monetdb.31236 -# 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 = 2 - -# 14:24:10 > -# 14:24:10 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21213" "--port=31236" -# 14:24:10 > - - -# 14:24:13 > -# 14:24:13 > "Done." -# 14:24:13 > - diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out deleted file mode 100644 --- a/clients/Tests/MAL-signatures_gsl.stable.out +++ /dev/null @@ -1,42988 +0,0 @@ -stdout of test 'MAL-signatures_gsl` in directory 'clients` itself: - - -# 14:24:10 > -# 14:24:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31236" "--set" "mapi_usock=/var/tmp/mtest-21213/.s.monetdb.31236" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=2" -# 14:24:10 > - -# MonetDB 5 server v11.17.0 -# 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-2014 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:31236/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21213/.s.monetdb.31236 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. - -# 14:24:10 > -# 14:24:10 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21213" "--port=31236" -# 14:24:10 > - -#?*) -command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on dbl, also returns count - -command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on dbl, also returns count - -command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on dbl - -command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on dbl - -command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on flt, also returns count - -command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on flt, also returns count - -command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on flt - -command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on flt - -command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on lng, also returns count - -command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on lng, also returns count - -command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on lng - -command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on lng - -command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on wrd, also returns count - -command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on wrd, also returns count - -command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on wrd - -command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on wrd - -command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on int, also returns count - -command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on int, also returns count - -command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on int - -command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on int - -command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on sht, also returns count - -command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on sht, also returns count - -command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on sht - -command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on sht - -command aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) -address AGGRavg23_dbl; -comment Grouped tail average on bte, also returns count - -command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) -address AGGRavg22_dbl; -comment Grouped tail average on bte, also returns count - -command aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg13_dbl; -comment Grouped tail average on bte - -command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]):bat[:oid,:dbl] -address AGGRavg12_dbl; -comment Grouped tail average on bte - -command aggr.avg(b:bat[:any_1,:dbl]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:flt]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:lng]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:wrd]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:int]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:sht]):dbl -address ALGavg; -comment Gives the avg of all tail values - -command aggr.avg(b:bat[:any_1,:bte]):dbl -address ALGavg; -comment Gives the avg of all tail values - -function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; -function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
