MonetDB: Jun2016 - Merge with Jul2015 branch.

Sjoerd Mullender Wed, 30 Mar 2016 02:36:42 -0700

Changeset: df3f0dc236b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df3f0dc236b1
Modified Files:
        NT/rules.msc
        clients/Tests/All
        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
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check5.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
Branch: Jun2016
Log Message:


Merge with Jul2015 branch.


diffs (85 lines):

diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -274,19 +274,21 @@ create_winconfig_conds_new_py:
        $(ECHO) # > "$(TOPDIR)\winconfig_conds_new.py"
 !IFDEF BITS32
        $(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+       $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
        $(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
 !IFDEF BITS64
        $(ECHO) BITS64_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
-       $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
-!IFDEF BITS64OID32
+!IFDEF MONET_OID32
        $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
        $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ENDIF
+!ELSE
+       $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+       $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
+!ENDIF
 !IFDEF CROSS_COMPILING
        $(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
 exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
-!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&!HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
+!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&!HAVE_SHP&HAVE_SAMTOOLS?SQL-dump
 MERCURIAL?malcheck
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
@@ -2,4 +2,4 @@ HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?
 HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?upgrade
 HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY&RELEASERUN?package
 HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?dump
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?check
+HAVE_HGE&HAVE_GEOM&HAVE_PCRE&PREVHGECHAINRELEMPTY?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
@@ -2,4 +2,4 @@ HAVE_GEOM&PREVCHAINRELEMPTY?unpackage
 HAVE_GEOM&PREVCHAINRELEMPTY?upgrade
 !HAVE_HGE&HAVE_GEOM&PREVCHAINRELEMPTY&RELEASERUN?package
 HAVE_GEOM&PREVCHAINRELEMPTY?dump
-HAVE_GEOM&PREVCHAINRELEMPTY?check
+HAVE_GEOM&HAVE_PCRE&PREVCHAINRELEMPTY?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_GEOM&PREVHGERELEMPTY?check
+HAVE_HGE&HAVE_GEOM&HAVE_PCRE&PREVHGERELEMPTY?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_GEOM&PREVRELEMPTY?check
+HAVE_GEOM&HAVE_PCRE&PREVRELEMPTY?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
@@ -2,4 +2,4 @@ HAVE_GEOM?load
 
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
+!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&HAVE_PCRE&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?check
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2016 - Merge with Jul2015 branch.

Reply via email to