Changeset: 64bf074b6f46 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64bf074b6f46 Modified Files: configure.ag sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb/Tests/All sql/test/emptydb/Tests/check.stable.out Branch: default Log Message:
Merge with Jun2016 branch. diffs (12 lines): diff --git a/sql/test/emptydb/Tests/All b/sql/test/emptydb/Tests/All --- a/sql/test/emptydb/Tests/All +++ b/sql/test/emptydb/Tests/All @@ -1,5 +1,5 @@ HAVE_GEOM?load -RELEASERUN&!HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32?package -RELEASERUN&HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32?package-hge +RELEASERUN&!HAVE_HGE&!HAVE_LIDAR&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32?package +RELEASERUN&HAVE_HGE&!HAVE_LIDAR&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32?package-hge HAVE_GEOM?dump -!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&HAVE_PCRE&!HAVE_SAMTOOLS&!BITS32?check +!HAVE_LIDAR&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&HAVE_PCRE&!HAVE_SAMTOOLS&!BITS32?check _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list