Changeset: 657239f6ceaf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=657239f6ceaf
Modified Files:
clients/Tests/All
sql/jdbc/tests/Tests/All
sql/test/Tests/All
sql/test/leaks/Tests/All
testing/Mtest.py.in
Branch: default
Log Message:
shield "availability" tests (also) with conditional HAVE_NETCDF
diffs (78 lines):
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_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump
+HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump
MERCURIAL?malcheck
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
@@ -5,7 +5,7 @@ HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
HAVE_JDBCTESTS?Test_Ctransaction
#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
-HAVE_JDBCTESTS&HAVE_SAMTOOLS?Test_Dobjects
+HAVE_JDBCTESTS&HAVE_SAMTOOLS&HAVE_NETCDF?Test_Dobjects
HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PSsomeamount
HAVE_JDBCTESTS?Test_PSlargebatchval
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -1,4 +1,4 @@
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?systemfunctions
+HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?systemfunctions
example
example-queries
example-drop
diff --git a/sql/test/leaks/Tests/All b/sql/test/leaks/Tests/All
--- a/sql/test/leaks/Tests/All
+++ b/sql/test/leaks/Tests/All
@@ -1,12 +1,12 @@
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check0
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check1
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp1
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check2
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp2
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check3
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp3
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?drop3
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check4
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check5
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select1
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select2
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check0
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check1
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp1
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check2
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp2
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check3
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp3
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?drop3
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check4
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check5
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select1
+HAVE_NETCDF&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select2
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -296,7 +296,6 @@ CONDITIONALS = {
'HAVE_CURL' : "@HAVE_CURL_FALSE@",
'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@",
'HAVE_FITS' : "@HAVE_FITS_FALSE@",
- 'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_GDK' : "@HAVE_GDK_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_GSL' : "@HAVE_GSL_FALSE@",
@@ -308,6 +307,7 @@ CONDITIONALS = {
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
+ 'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
'HAVE_PERL' : "@HAVE_PERL_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
