Changeset: cda402643811 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cda402643811 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/testdb-upgrade-chain-hge/Tests/All sql/test/testdb-upgrade-chain/Tests/All sql/test/testdb-upgrade-hge/Tests/All sql/test/testdb-upgrade/Tests/All Branch: Jul2021 Log Message:
Can't run upgrade tests under sql_debug=128 (there is a WAL to upgrade). Also simplified conditions. diffs (72 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,3 +1,3 @@ -HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?upgrade -HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&RELEASERUN?package -KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?check +HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&!NOWAL?upgrade +RELEASERUN?package +KNOWNFAIL?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,3 +1,3 @@ -HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY?upgrade -!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY&RELEASERUN?package -KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?check +HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY&!NOWAL?upgrade +RELEASERUN?package +KNOWNFAIL?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,2 +1,2 @@ -HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGERELEMPTY?upgrade -HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?check +HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGERELEMPTY&!NOWAL?upgrade +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,2 +1,2 @@ -HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?upgrade -HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP&HAVE_SHP?check +HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY&!NOWAL?upgrade +check diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/All b/sql/test/testdb-upgrade-chain-hge/Tests/All --- a/sql/test/testdb-upgrade-chain-hge/Tests/All +++ b/sql/test/testdb-upgrade-chain-hge/Tests/All @@ -1,3 +1,3 @@ -HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?upgrade -HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&RELEASERUN?package -HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?dump +HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&!NOWAL?upgrade +RELEASERUN?package +dump diff --git a/sql/test/testdb-upgrade-chain/Tests/All b/sql/test/testdb-upgrade-chain/Tests/All --- a/sql/test/testdb-upgrade-chain/Tests/All +++ b/sql/test/testdb-upgrade-chain/Tests/All @@ -1,3 +1,3 @@ -HAVE_GEOM&PREVCHAINREL?upgrade -!HAVE_HGE&HAVE_GEOM&PREVCHAINREL&RELEASERUN?package -HAVE_GEOM&PREVCHAINREL?dump +HAVE_GEOM&PREVCHAINREL&!NOWAL?upgrade +RELEASERUN?package +dump diff --git a/sql/test/testdb-upgrade-hge/Tests/All b/sql/test/testdb-upgrade-hge/Tests/All --- a/sql/test/testdb-upgrade-hge/Tests/All +++ b/sql/test/testdb-upgrade-hge/Tests/All @@ -1,2 +1,2 @@ -HAVE_HGE&HAVE_GEOM&PREVHGEREL?upgrade -HAVE_HGE&HAVE_GEOM&PREVHGEREL?dump +HAVE_HGE&HAVE_GEOM&PREVHGEREL&!NOWAL?upgrade +dump diff --git a/sql/test/testdb-upgrade/Tests/All b/sql/test/testdb-upgrade/Tests/All --- a/sql/test/testdb-upgrade/Tests/All +++ b/sql/test/testdb-upgrade/Tests/All @@ -1,2 +1,2 @@ -HAVE_GEOM&PREVREL?upgrade -HAVE_GEOM&PREVREL?dump +HAVE_GEOM&PREVREL&!NOWAL?upgrade +dump _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
