Misc build and test fixes (#1905)

* Misc build fixes

* Fix apple tests

contrib/CMakeLists.txt

@@ -90,7 +90,9 @@ if (USE_INTERNAL_RDKAFKA_LIBRARY)
 endif ()
 
 if (USE_INTERNAL_CAPNP_LIBRARY)
-    set (BUILD_TESTING ${ENABLE_TESTS} CACHE INTERNAL "")
+    if (NOT APPLE) # tests never end
+        set (BUILD_TESTING ${ENABLE_TESTS} CACHE INTERNAL "")
+    endif ()
     set (_save ${CMAKE_CXX_EXTENSIONS})
     set (CMAKE_CXX_EXTENSIONS)
     add_subdirectory (capnproto/c++)

dbms/src/Columns/ColumnFunction.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/NamesAndTypes.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Columns/IColumn.h>
 
 class IFunctionBase;

dbms/src/IO/parseDateTimeBestEffort.h

@@ -1,5 +1,5 @@
 #include <stddef.h>
-
+#include <time.h>
 
 class DateLUTImpl;
 

dbms/src/Server/main.cpp

@@ -45,6 +45,7 @@ std::pair<const char *, MainFunc> clickhouse_applications[] =
     {"copier", mainEntryClickHouseClusterCopier},
 #if USE_EMBEDDED_COMPILER
     {"clang", mainEntryClickHouseClang},
+    {"clang++", mainEntryClickHouseClang},
     {"lld", mainEntryClickHouseLLD},
 #endif
 };

utils/check_include.sh

@@ -4,10 +4,11 @@
 # Finds missing #include <...>
 # prints compile time, number of includes, use with sort: ./check_include.sh 2>&1 | sort -rk3
 pwd=`pwd`
+BUILD_DIR=${BUILD_DIR:=./build}
 inc="-I. \
 -I./contrib/libdivide \
--I./contrib/libre2 \
--I./build/contrib/libre2 \
+-I./contrib/re2 \
+-I${BUILD_DIR}/contrib/re2_st \
 -I./contrib/libfarmhash \
 -I./contrib/libmetrohash/src \
 -I./contrib/double-conversion \
@@ -15,7 +16,7 @@ inc="-I. \
 -I./contrib/zookeeper/src/c/include \
 -I./contrib/zookeeper/src/c/generated \
 -I./contrib/libtcmalloc/include \
--I./build/contrib/zlib-ng \
+-I${BUILD_DIR}/contrib/zlib-ng \
 -I./contrib/zlib-ng \
 -I./contrib/poco/MongoDB/include \
 -I./contrib/poco/XML/include \
@@ -30,12 +31,12 @@ inc="-I. \
 -I./contrib/libpcg-random/include \
 -I./libs/libmysqlxx/include \
 -I./libs/libcommon/include \
--I./build/libs/libcommon/include \
+-I${BUILD_DIR}/libs/libcommon/include \
 -I./libs/libpocoext/include \
 -I./libs/libzkutil/include \
 -I./libs/libdaemon/include \
 -I./dbms/src \
--I./build/dbms/src"
+-I${BUILD_DIR}/dbms/src"
 
 if [ -z $1 ]; then
     cd ..
@@ -43,5 +44,5 @@ if [ -z $1 ]; then
 else
     echo -n "$1    "
     echo -n `grep "#include" $1| wc -l` "    "
-    echo -e "#include <$1> \n int main() {return 0;}" | time --format "%e %M" g++-7 -c -std=c++1z $inc -x c++ -
+    echo -e "#include <$1> \n int main() {return 0;}" | time --format "%e %M" ${CXX:=g++-7} -c -std=c++1z $inc -x c++ -
 fi