Changeset: 86037574238f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86037574238f Added Files: sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb/Tests/package-hge.stable.err.int128 sql/test/emptydb/Tests/package-hge.stable.out.int128 Removed Files: sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err sql/test/emptydb-upgrade-hge/Tests/check.stable.err sql/test/emptydb-upgrade-hge/Tests/dump.stable.err sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err sql/test/emptydb/Tests/package-hge.stable.err sql/test/emptydb/Tests/package-hge.stable.out Modified Files: sql/test/emptydb/Tests/All Branch: Jun2016 Log Message:
Merge with Jul2015 branch. diffs (53 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err rename to sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err rename to sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err b/sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err rename to sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out b/sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out rename to sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err b/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err rename to sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out b/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out rename to sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err.int128 rename from sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err rename to sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-hge/Tests/check.stable.err b/sql/test/emptydb-upgrade-hge/Tests/check.stable.err.int128 rename from sql/test/emptydb-upgrade-hge/Tests/check.stable.err rename to sql/test/emptydb-upgrade-hge/Tests/check.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-hge/Tests/dump.stable.err b/sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 rename from sql/test/emptydb-upgrade-hge/Tests/dump.stable.err rename to sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err b/sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 rename from sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err rename to sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 diff --git a/sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out b/sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 rename from sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out rename to sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err.int128 rename from sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err rename to sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err.int128 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 -!HAVE_HGE&HAVE_GEOM&RELEASERUN?package -HAVE_HGE&HAVE_GEOM&RELEASERUN?package-hge +RELEASERUN&!HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?package +RELEASERUN&HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?package-hge HAVE_GEOM?dump !HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?check diff --git a/sql/test/emptydb/Tests/package-hge.stable.err b/sql/test/emptydb/Tests/package-hge.stable.err.int128 rename from sql/test/emptydb/Tests/package-hge.stable.err rename to sql/test/emptydb/Tests/package-hge.stable.err.int128 diff --git a/sql/test/emptydb/Tests/package-hge.stable.out b/sql/test/emptydb/Tests/package-hge.stable.out.int128 rename from sql/test/emptydb/Tests/package-hge.stable.out rename to sql/test/emptydb/Tests/package-hge.stable.out.int128 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
