Changeset: 8536f210927d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8536f210927d
Modified Files:
sql/test/BugTracker-2013/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
testing/CMakeLists.txt
testing/Mtest.py.in
Branch: mbedded
Log Message:
use HAVE_LIBPCRE consistently
diffs (85 lines):
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -6,7 +6,7 @@ select-around-zero.Bug-3220
segfault_in_aggregation.Bug-3225
subtract-one-year.Bug-3215
HAVE_PERL?perl-undef-0.Bug-3235
-HAVE_PCRE?crash-from-optimizer.Bug-3241
+HAVE_LIBPCRE?crash-from-optimizer.Bug-3241
select-view-view.Bug-3245
stddev-group.Bug-3257
oid_handling
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_FITS&HAVE_GEOM&HAVE_LIDAR&
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?upgrade
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&RELEASERUN?package
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?dump
-KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?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_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETC
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY?upgrade
!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY&RELEASERUN?package
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY?dump
-KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?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_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGERELEMPTY?unpackage
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGERELEMPTY?upgrade
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVHGERELEMPTY?dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP?check
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?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_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?unpackage
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?upgrade
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&PREVRELEMPTY?dump
-KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP&HAVE_SHP?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 @@ load
RELEASERUN&!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP?package
RELEASERUN&HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP?package-hge
dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP?check
+HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?check
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -65,9 +65,9 @@ endif(HAVE_FITS)
if (HAVE_NETCDF)
set(HAVE_NETCDF_FALSE "#")
endif(HAVE_NETCDF)
-if (HAVE_PCRE)
- set(HAVE_PCRE_FALSE "#")
-endif(HAVE_PCRE)
+if (HAVE_LIBPCRE)
+ set(HAVE_LIBPCRE_FALSE "#")
+endif(HAVE_LIBPCRE)
if (HAVE_LIBPY3)
set(HAVE_LIBPY3_FALSE "#")
endif(HAVE_LIBPY3)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -376,7 +376,7 @@ CONDITIONALS = {
'HAVE_MAL_DEBUGGER' : "@HAVE_MAL_DEBUGGER_FALSE@",
'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
- 'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
+ 'HAVE_LIBPCRE' : "@HAVE_LIBPCRE_FALSE@",
'HAVE_PROJ' : "@HAVE_PROJ_FALSE@",
'HAVE_TESTING' : "@HAVE_TESTING_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
