Changeset: 6ddb878f6cee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ddb878f6cee
Modified Files:
        sql/test/emptydb-upgrade-chain-hge/Tests/All
        sql/test/emptydb-upgrade-chain/Tests/All
        sql/test/emptydb-upgrade-hge/Tests/All
        sql/test/emptydb-upgrade/Tests/All
        sql/test/emptydb/Tests/All
Branch: Mar2018
Log Message:

The emptydb upgrades depend on all features of to-be-upgraded database.
I.e. harmonize conditions.


diffs (62 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/All 
b/sql/test/emptydb-upgrade-chain-hge/Tests/All
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/All
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/All
@@ -1,5 +1,5 @@
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?unpackage
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?upgrade
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY&RELEASERUN?package
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?dump
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY?unpackage
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY?upgrade
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY&RELEASERUN?package
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY?dump
 
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade-chain/Tests/All 
b/sql/test/emptydb-upgrade-chain/Tests/All
--- a/sql/test/emptydb-upgrade-chain/Tests/All
+++ b/sql/test/emptydb-upgrade-chain/Tests/All
@@ -1,5 +1,5 @@
-HAVE_GEOM&PREVCHAINRELEMPTY?unpackage
-HAVE_GEOM&PREVCHAINRELEMPTY?upgrade
-!HAVE_HGE&HAVE_GEOM&PREVCHAINRELEMPTY&RELEASERUN?package
-HAVE_GEOM&PREVCHAINRELEMPTY?dump
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY?unpackage
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY?upgrade
+!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY&RELEASERUN?package
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY?dump
 
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade-hge/Tests/All 
b/sql/test/emptydb-upgrade-hge/Tests/All
--- a/sql/test/emptydb-upgrade-hge/Tests/All
+++ b/sql/test/emptydb-upgrade-hge/Tests/All
@@ -1,4 +1,4 @@
-HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?unpackage
-HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?upgrade
-HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?dump
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGERELEMPTY?unpackage
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGERELEMPTY?upgrade
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGERELEMPTY?dump
 
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade/Tests/All 
b/sql/test/emptydb-upgrade/Tests/All
--- a/sql/test/emptydb-upgrade/Tests/All
+++ b/sql/test/emptydb-upgrade/Tests/All
@@ -1,4 +1,4 @@
-HAVE_GEOM&PREVRELEMPTY?unpackage
-HAVE_GEOM&PREVRELEMPTY?upgrade
-HAVE_GEOM&PREVRELEMPTY?dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?unpackage
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?upgrade
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?dump
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SHP?check
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_LIDAR&HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_SAMTOOLS?package
-RELEASERUN&HAVE_HGE&HAVE_LIDAR&HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_SAMTOOLS?package-hge
-HAVE_GEOM?dump
+load
+RELEASERUN&!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?package
+RELEASERUN&HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?package-hge
+dump
 
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to