Changeset: a092694e9572 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a092694e9572 Added Files: clients/Tests/SQL-dump_all.sql.src clients/Tests/SQL-dump_all.stable.err clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_none.sql.src clients/Tests/SQL-dump_none.stable.err clients/Tests/SQL-dump_none.stable.out Removed Files: clients/Tests/SQL-dump_bam.sql.src clients/Tests/SQL-dump_bam.stable.err clients/Tests/SQL-dump_bam.stable.out clients/Tests/SQL-dump_bam.stable.out.oid32 clients/Tests/SQL-dump_nogeom.sql.src clients/Tests/SQL-dump_nogeom.stable.err clients/Tests/SQL-dump_nogeom.stable.out Modified Files: clients/Tests/All Branch: Oct2014 Log Message:
Merge with Jan2014 branch. diffs (72 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -7,5 +7,5 @@ HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_L !HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_nogeom +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_all +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_none diff --git a/clients/Tests/SQL-dump_bam.sql.src b/clients/Tests/SQL-dump_all.sql.src rename from clients/Tests/SQL-dump_bam.sql.src rename to clients/Tests/SQL-dump_all.sql.src diff --git a/clients/Tests/SQL-dump_bam.stable.err b/clients/Tests/SQL-dump_all.stable.err rename from clients/Tests/SQL-dump_bam.stable.err rename to clients/Tests/SQL-dump_all.stable.err --- a/clients/Tests/SQL-dump_bam.stable.err +++ b/clients/Tests/SQL-dump_all.stable.err @@ -1,4 +1,4 @@ -stderr of test 'SQL-dump_bam` in directory 'clients` itself: +stderr of test 'SQL-dump_all` in directory 'clients` itself: # 15:01:36 > diff --git a/clients/Tests/SQL-dump_bam.stable.out b/clients/Tests/SQL-dump_all.stable.out rename from clients/Tests/SQL-dump_bam.stable.out rename to clients/Tests/SQL-dump_all.stable.out --- a/clients/Tests/SQL-dump_bam.stable.out +++ b/clients/Tests/SQL-dump_all.stable.out @@ -1,4 +1,4 @@ -stdout of test 'SQL-dump_bam` in directory 'clients` itself: +stdout of test 'SQL-dump_all` in directory 'clients` itself: # 15:01:36 > diff --git a/clients/Tests/SQL-dump_bam.stable.out.oid32 b/clients/Tests/SQL-dump_all.stable.out.oid32 rename from clients/Tests/SQL-dump_bam.stable.out.oid32 rename to clients/Tests/SQL-dump_all.stable.out.oid32 --- a/clients/Tests/SQL-dump_bam.stable.out.oid32 +++ b/clients/Tests/SQL-dump_all.stable.out.oid32 @@ -1,4 +1,4 @@ -stdout of test 'SQL-dump_bam` in directory 'clients` itself: +stdout of test 'SQL-dump_all` in directory 'clients` itself: # 15:01:36 > diff --git a/clients/Tests/SQL-dump_nogeom.sql.src b/clients/Tests/SQL-dump_none.sql.src rename from clients/Tests/SQL-dump_nogeom.sql.src rename to clients/Tests/SQL-dump_none.sql.src diff --git a/clients/Tests/SQL-dump_nogeom.stable.err b/clients/Tests/SQL-dump_none.stable.err rename from clients/Tests/SQL-dump_nogeom.stable.err rename to clients/Tests/SQL-dump_none.stable.err --- a/clients/Tests/SQL-dump_nogeom.stable.err +++ b/clients/Tests/SQL-dump_none.stable.err @@ -1,4 +1,4 @@ -stderr of test 'SQL-dump_nogeom` in directory 'clients` itself: +stderr of test 'SQL-dump_none` in directory 'clients` itself: # 15:01:36 > diff --git a/clients/Tests/SQL-dump_nogeom.stable.out b/clients/Tests/SQL-dump_none.stable.out rename from clients/Tests/SQL-dump_nogeom.stable.out rename to clients/Tests/SQL-dump_none.stable.out --- a/clients/Tests/SQL-dump_nogeom.stable.out +++ b/clients/Tests/SQL-dump_none.stable.out @@ -1,4 +1,4 @@ -stdout of test 'SQL-dump_nogeom` in directory 'clients` itself: +stdout of test 'SQL-dump_none` in directory 'clients` itself: # 15:01:36 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
