Changeset: b5068c63e77f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5068c63e77f Removed Files: clients/Tests/SQL-dump.stable.out.oid32 Modified Files: clients/Tests/All configure.ag testing/Mtest.py.in Branch: Oct2014 Log Message:
Created test conditional BITS64OID32 for --enable-oid32 on 64-bit architectures. Also, don't test clients/SQL-dump in that case. diffs (truncated from 8949 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,4 @@ exports HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!ENABLE_DATACELL&!HAVE_JSONSTORE?MAL-signatures -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32?SQL-dump +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32&!BITS64OID32?SQL-dump MERCURIAL?malcheck diff --git a/clients/Tests/SQL-dump.stable.out.oid32 b/clients/Tests/SQL-dump.stable.out.oid32 deleted file mode 100644 --- a/clients/Tests/SQL-dump.stable.out.oid32 +++ /dev/null @@ -1,8913 +0,0 @@ -stdout of test 'SQL-dump` 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-2015 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 - -# 15:19:38 > -# 15:19:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-517" "--port=32251" -# 15:19:38 > - -SYSTEM SCHEMA bam -SYSTEM SCHEMA json -SYSTEM SCHEMA sys -SYSTEM SCHEMA tmp -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.env -SYSTEM FUNCTION sys.envelope -SYSTEM FUNCTION sys.environment -SYSTEM FUNCTION sys.equals -SYSTEM FUNCTION sys.evalalgebra -SYSTEM FUNCTION sys.fuse -SYSTEM FUNCTION sys.generate_series -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.hashsize -SYSTEM FUNCTION sys.heapsize -SYSTEM FUNCTION sys.host -SYSTEM FUNCTION sys.hostmask -SYSTEM FUNCTION sys.ilike -SYSTEM FUNCTION sys.imprintsize -SYSTEM FUNCTION sys.intersection -SYSTEM FUNCTION sys.isaurl -SYSTEM FUNCTION sys.isauuid -SYSTEM FUNCTION sys.isempty -SYSTEM FUNCTION sys.issimple -SYSTEM FUNCTION sys.left_shift -SYSTEM FUNCTION sys.left_shift_assign -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.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.right_shift -SYSTEM FUNCTION sys.right_shift_assign -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 -SYSTEM FUNCTION sys.storagemodel -SYSTEM FUNCTION sys.storagemodelinit -SYSTEM FUNCTION sys.str_to_date -SYSTEM FUNCTION sys.symdifference -SYSTEM FUNCTION sys.text -SYSTEM FUNCTION sys.times -SYSTEM FUNCTION sys.touches -SYSTEM FUNCTION sys.tracelog -SYSTEM FUNCTION sys.uuid -SYSTEM FUNCTION sys.vacuum -SYSTEM FUNCTION sys.var -SYSTEM FUNCTION sys.var_pop -SYSTEM FUNCTION sys.var_samp -SYSTEM FUNCTION sys.within -SYSTEM FUNCTION sys.x -SYSTEM FUNCTION sys.y -SYSTEM FUNCTION sys.zorder_decode_x -SYSTEM FUNCTION sys.zorder_decode_y -SYSTEM FUNCTION sys.zorder_encode -CREATE SCHEMA "bam" AUTHORIZATION "monetdb"; -CREATE SCHEMA "json" AUTHORIZATION "monetdb"; -CREATE SCHEMA "tmp"; -CREATE SCHEMA "sys"; -CREATE TABLE "sys"."_columns" ( - "id" INTEGER, - "name" VARCHAR(1024), - "type" VARCHAR(1024), - "type_digits" INTEGER, - "type_scale" INTEGER, - "table_id" INTEGER, - "default" VARCHAR(2048), - "null" BOOLEAN, - "number" INTEGER, - "storage" VARCHAR(2048) -); -CREATE TABLE "sys"."_tables" ( - "id" INTEGER, - "name" VARCHAR(1024), - "schema_id" INTEGER, - "query" VARCHAR(2048), - "type" SMALLINT, - "system" BOOLEAN, - "commit_action" SMALLINT, - "readonly" BOOLEAN -); -CREATE TABLE "sys"."args" ( - "id" INTEGER, - "func_id" INTEGER, - "name" VARCHAR(256), - "type" VARCHAR(1024), - "type_digits" INTEGER, - "type_scale" INTEGER, - "inout" TINYINT, - "number" INTEGER -); -CREATE TABLE "sys"."auths" ( - "id" INTEGER, - "name" VARCHAR(1024), - "grantor" INTEGER _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
