Changeset: dc073cdfa931 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc073cdfa931
Modified Files:
debian/fix-deb.sh
sql/jdbc/tests/Tests/All
Branch: default
Log Message:
Merge with Dec2016 branch
diffs (61 lines):
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -53,3 +53,10 @@ wheezy | jessie | precise | trusty | wil
sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
;;
esac
+
+case $SUITE in
+wheezy | precise)
+ # numpy is too old
+ sed -i '/pyintegration=yes/s/yes/no/' debian/rules
+ ;;
+esac
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -4,31 +4,31 @@ HAVE_JDBCTESTS?Test_Clargequery
HAVE_JDBCTESTS?Test_Cmanycon
HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
+#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
HAVE_JDBCTESTS?Test_Ctransaction
-#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
-HAVE_JDBCTESTS&HAVE_SAMTOOLS&HAVE_NETCDF&HAVE_GEOM?Test_Dobjects
+HAVE_JDBCTESTS&HAVE_NETCDF&HAVE_GEOM?Test_Dobjects
+HAVE_JDBCTESTS?Test_FetchSize
+HAVE_JDBCTESTS&HAVE_HGE?Test_Int128
+HAVE_JDBCCLIENT_JAR?Test_JdbcClient
HAVE_JDBCTESTS?Test_PSgeneratedkeys
-HAVE_JDBCTESTS?Test_PSsomeamount
+HAVE_JDBCTESTS?Test_PSgetObject
HAVE_JDBCTESTS?Test_PSlargebatchval
HAVE_JDBCTESTS?Test_PSlargeresponse
#HAVE_JDBCTESTS?Test_PSlargeamount # scalabity test which is disabled by
default (it takes a long time to run and does not need to be run everytime,
only before a new release)
-HAVE_JDBCTESTS?Test_Smoreresults
+HAVE_JDBCTESTS?Test_PSmanycon
+HAVE_JDBCTESTS?Test_PSmetadata
+HAVE_JDBCTESTS?Test_PSsomeamount
+HAVE_JDBCTESTS?Test_PSsqldata
HAVE_JDBCTESTS?Test_PStimedate
HAVE_JDBCTESTS?Test_PStimezone
HAVE_JDBCTESTS?Test_PStypes
-HAVE_JDBCTESTS?Test_PSgetObject
-HAVE_JDBCTESTS?Test_PSmanycon
-HAVE_JDBCTESTS?Test_PSmetadata
-HAVE_JDBCTESTS?Test_PSsqldata
HAVE_JDBCTESTS?Test_Rbooleans
HAVE_JDBCTESTS?Test_Rmetadata
HAVE_JDBCTESTS?Test_Rpositioning
+HAVE_JDBCTESTS?Test_Rsqldata
HAVE_JDBCTESTS?Test_Rtimedate
-HAVE_JDBCTESTS?Test_Rsqldata
HAVE_JDBCTESTS?Test_Sbatching
-HAVE_JDBCTESTS&HAVE_HGE?Test_Int128
-HAVE_JDBCTESTS?Test_FetchSize
-HAVE_JDBCCLIENT_JAR?Test_JdbcClient
+HAVE_JDBCTESTS?Test_Smoreresults
HAVE_JDBCTESTS?Test_Wrapper
HAVE_JDBCTESTS?BugConcurrent_clients_SF_1504657
HAVE_JDBCTESTS?BugConcurrent_sequences
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
