Changeset: f7dcb8bd00dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7dcb8bd00dc
Modified Files:
NT/rules.msc
testing/CMakeLists.txt
testing/Mtest.py.in
Branch: default
Log Message:
Sort conditionals, make sure they're all covered.
diffs (142 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -278,11 +278,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_CURL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_DEVELOPER
- $(ECHO) HAVE_DEVELOPER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_DEVELOPER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_FITS
$(ECHO) HAVE_FITS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -368,11 +363,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_MAL_DEBUGGER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_TESTING
- $(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_TESTING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF NATIVE_WIN32
$(ECHO) NATIVE_WIN32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -35,15 +35,18 @@ set(QXSOURCE "${CMAKE_SOURCE_DIR}")
set(QXsysconfdir "${CMAKE_INSTALL_SYSCONFDIR}")
set(SOURCE "${CMAKE_SOURCE_DIR}")
-if (HAVE_LIBR)
- set(HAVE_LIBR_FALSE "#")
-endif(HAVE_LIBR)
-if (HAVE_LIBXML)
- set(HAVE_LIBXML_FALSE "#")
-endif(HAVE_LIBXML)
-if (HAVE_LIBZ)
- set(HAVE_LIBZ_FALSE "#")
-endif(HAVE_LIBZ)
+if (HAVE_CURL)
+ set(HAVE_CURL_FALSE "#")
+endif(HAVE_CURL)
+if (HAVE_FITS)
+ set(HAVE_FITS_FALSE "#")
+endif(HAVE_FITS)
+if (HAVE_GEOM)
+ set(HAVE_GEOM_FALSE "#")
+endif(HAVE_GEOM)
+if (HAVE_HGE)
+ set(HAVE_HGE_FALSE "#")
+endif(HAVE_HGE)
if (HAVE_LIBBZ2)
set(HAVE_LIBBZ2_FALSE "#")
endif(HAVE_LIBBZ2)
@@ -53,30 +56,36 @@ endif(HAVE_LIBLZ4)
if (HAVE_LIBLZMA)
set(HAVE_LIBLZMA_FALSE "#")
endif(HAVE_LIBLZMA)
-if (HAVE_GEOM)
- set(HAVE_GEOM_FALSE "#")
-endif(HAVE_GEOM)
-if (HAVE_ODBC)
- set(HAVE_ODBC_FALSE "#")
-endif(HAVE_ODBC)
-if (HAVE_FITS)
- set(HAVE_FITS_FALSE "#")
-endif(HAVE_FITS)
-if (HAVE_NETCDF)
- set(HAVE_NETCDF_FALSE "#")
-endif(HAVE_NETCDF)
if (HAVE_LIBPCRE)
set(HAVE_LIBPCRE_FALSE "#")
endif(HAVE_LIBPCRE)
if (HAVE_LIBPY3)
set(HAVE_LIBPY3_FALSE "#")
endif(HAVE_LIBPY3)
+if (HAVE_LIBR)
+ set(HAVE_LIBR_FALSE "#")
+endif(HAVE_LIBR)
+if (HAVE_LIBXML)
+ set(HAVE_LIBXML_FALSE "#")
+endif(HAVE_LIBXML)
+if (HAVE_LIBZ)
+ set(HAVE_LIBZ_FALSE "#")
+endif(HAVE_LIBZ)
if (HAVE_LIDAR)
set(HAVE_LIDAR_FALSE "#")
endif(HAVE_LIDAR)
-if (HAVE_HGE)
- set(HAVE_HGE_FALSE "#")
-endif(HAVE_HGE)
+if (HAVE_NETCDF)
+ set(HAVE_NETCDF_FALSE "#")
+endif(HAVE_NETCDF)
+if (HAVE_ODBC)
+ set(HAVE_ODBC_FALSE "#")
+endif(HAVE_ODBC)
+if (HAVE_PROJ)
+ set(HAVE_PROJ_FALSE "#")
+endif(HAVE_PROJ)
+if (HAVE_SHP)
+ set(HAVE_SHP_FALSE "#")
+endif(HAVE_SHP)
if (NOT WIN32)
set(NOT_WIN32_FALSE "#")
endif()
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -360,25 +360,23 @@ CONDITIONALS = {
'BITS64' : "@BITS64_FALSE@",
'CROSS_COMPILING' : "@CROSS_COMPILING_FALSE@",
'HAVE_CURL' : "@HAVE_CURL_FALSE@",
- 'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@",
'HAVE_FITS' : "@HAVE_FITS_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_HGE' : "@HAVE_HGE_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBLZ4' : "@HAVE_LIBLZ4_FALSE@",
'HAVE_LIBLZMA' : "@HAVE_LIBLZMA_FALSE@",
+ 'HAVE_LIBPCRE' : "@HAVE_LIBPCRE_FALSE@",
+ 'HAVE_LIBPY3' : "@HAVE_LIBPY3_FALSE@",
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
- 'HAVE_LIBPY3' : "@HAVE_LIBPY3_FALSE@",
'HAVE_LIBXML' : "@HAVE_LIBXML_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_LIDAR' : "@HAVE_LIDAR_FALSE@",
- 'HAVE_SHP' : "@HAVE_SHP_FALSE@",
'HAVE_MAL_DEBUGGER' : "@HAVE_MAL_DEBUGGER_FALSE@",
'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
- 'HAVE_LIBPCRE' : "@HAVE_LIBPCRE_FALSE@",
'HAVE_PROJ' : "@HAVE_PROJ_FALSE@",
- 'HAVE_TESTING' : "@HAVE_TESTING_FALSE@",
+ 'HAVE_SHP' : "@HAVE_SHP_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
# unknown at compile time;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
