Changeset: 3ba6226a62e6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ba6226a62e6
Modified Files:
Branch: default
Log Message:
merge with Jun2010: make sure we (try to) run ODBC tests only if we do have ODBC
diffs (162 lines):
diff -r 46a74207c25d -r 3ba6226a62e6 buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Wed Jul 07 17:30:06 2010 +0200
+++ b/buildtools/conf/winrules.msc Wed Jul 07 17:59:42 2010 +0200
@@ -285,6 +285,9 @@
!IFDEF HAVE_NETCDF
HAVE_NETCDF_FALSE=^#
!ENDIF
+!IFDEF HAVE_ODBC
+HAVE_ODBC_FALSE=^#
+!ENDIF
!IFDEF HAVE_PCRE
HAVE_PCRE_FALSE=^#
!ENDIF
@@ -345,6 +348,7 @@
"HAVE_MONETDB5_XML_FALSE=$(HAVE_MONETDB5_XML_FALSE)" \
"HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
+ "HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \
"HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)" \
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.32bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.32bit Wed Jul 07
17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.32bit Wed Jul 07
17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.64bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit Wed Jul 07
17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit Wed Jul 07
17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC Wed Jul
07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC Wed Jul
07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit Wed Jul
07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit Wed Jul
07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit
Wed Jul 07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit
Wed Jul 07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit
Wed Jul 07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit
Wed Jul 07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit
Wed Jul 07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit
Wed Jul 07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit Wed Jul
07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit Wed Jul
07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6
clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit
--- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit Wed Jul
07 17:30:06 2010 +0200
+++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit Wed Jul
07 17:59:42 2010 +0200
@@ -16,6 +16,7 @@
HAVE_BUILDTOOLS=#
HAVE_EXTRA_MK=
HAVE_MONETDB=#
+HAVE_ODBC=#
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/monetdb-clients-config.bat.in
--- a/clients/conf/monetdb-clients-config.bat.in Wed Jul 07 17:30:06
2010 +0200
+++ b/clients/conf/monetdb-clients-config.bat.in Wed Jul 07 17:59:42
2010 +0200
@@ -67,6 +67,7 @@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
echo have_monet...@have_monetdb_false@
+ echo have_od...@have_odbc_false@
echo have_pc...@have_pcre_false@
echo have_perl_dev...@have_perl_devel_false@
echo have_pe...@have_perl_false@
diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/monetdb-clients-config.in
--- a/clients/conf/monetdb-clients-config.in Wed Jul 07 17:30:06 2010 +0200
+++ b/clients/conf/monetdb-clients-config.in Wed Jul 07 17:59:42 2010 +0200
@@ -135,6 +135,7 @@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
echo have_monet...@have_monetdb_false@
+ echo have_od...@have_odbc_false@
echo have_pc...@have_pcre_false@
echo have_perl_dev...@have_perl_devel_false@
echo have_pe...@have_perl_false@
diff -r 46a74207c25d -r 3ba6226a62e6 sql/src/odbc/samples/Tests/All
--- a/sql/src/odbc/samples/Tests/All Wed Jul 07 17:30:06 2010 +0200
+++ b/sql/src/odbc/samples/Tests/All Wed Jul 07 17:59:42 2010 +0200
@@ -1,2 +1,2 @@
-odbcsample1
-testgetinfo
+HAVE_ODBC?odbcsample1
+HAVE_ODBC?testgetinfo
diff -r 46a74207c25d -r 3ba6226a62e6 testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Wed Jul 07 17:30:06 2010 +0200
+++ b/testing/src/Mtest.py.in Wed Jul 07 17:59:42 2010 +0200
@@ -3244,7 +3244,7 @@
if par['PACKAGE'] not in ('monetdb', 'monetdb-java', 'monetdb-clients'):
clientsCONDS = {}
GetCONDITIONALS(clientsCONDS, 'monetdb-clients')
- for l in ('RUBYGEM', 'PYTHON', 'PERL_SWIG'):
+ for l in ('RUBYGEM', 'PYTHON', 'PERL_SWIG', 'ODBC'):
c = 'HAVE_'+l
if clientsCONDS.has_key(c):
CONDITIONALS[c] = clientsCONDS[c]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
