[hawq] branch master updated: HAWQ-1694. enable dbcommon, univplan, storage ut

[huor]

This is an automated email from the ASF dual-hosted git repository.

huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git


The following commit(s) were added to refs/heads/master by this push:
     new bc2edae  HAWQ-1694. enable dbcommon,univplan,storage ut
bc2edae is described below

commit bc2edaec2647bb94014b33d942704efb7cdc1bcf
Author: oushu1tuyu1 <tu....@oushu.io>
AuthorDate: Tue Apr 9 09:59:03 2019 +0800

    HAWQ-1694. enable dbcommon,univplan,storage ut
---
 depends/dbcommon/Makefile                 | 1 +
 depends/dbcommon/src/CMakeLists.txt       | 1 +
 depends/dbcommon/test/unit/CMakeLists.txt | 2 +-
 depends/storage/Makefile                  | 1 +
 depends/univplan/Makefile                 | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/depends/dbcommon/Makefile b/depends/dbcommon/Makefile
index dd89703..8ea4330 100644
--- a/depends/dbcommon/Makefile
+++ b/depends/dbcommon/Makefile
@@ -44,6 +44,7 @@ ifeq ($(with_dbcommon), yes)
 all: build
        cd $(top_builddir)/$(subdir)/build; mkdir -p install; \
        $(MAKE) DESTDIR=$(abs_top_builddir)/$(subdir)/build/install install
+       cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
 
 install: build
        cd $(top_builddir)/$(subdir)/build && $(MAKE) install
diff --git a/depends/dbcommon/src/CMakeLists.txt 
b/depends/dbcommon/src/CMakeLists.txt
index 67a1b57..49df441 100644
--- a/depends/dbcommon/src/CMakeLists.txt
+++ b/depends/dbcommon/src/CMakeLists.txt
@@ -109,6 +109,7 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/codegen/src)
 INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
 INCLUDE_DIRECTORIES(/usr/local/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../libhdfs3/build/install/usr/local/hawq/include)
 LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
 LINK_DIRECTORIES(/usr/local/lib)
 
LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../libhdfs3/build/install/usr/local/hawq/lib)
diff --git a/depends/dbcommon/test/unit/CMakeLists.txt 
b/depends/dbcommon/test/unit/CMakeLists.txt
index 326de83..326d21c 100644
--- a/depends/dbcommon/test/unit/CMakeLists.txt
+++ b/depends/dbcommon/test/unit/CMakeLists.txt
@@ -27,4 +27,4 @@ ADD_EXECUTABLE(unit EXCLUDE_FROM_ALL
     ${unit_SOURCES}
 )
 
-target_link_libraries(unit ${CLANG_LDFLAGS} dbcommon-shared gtest gmock)
+target_link_libraries(unit ${CLANG_LDFLAGS} hdfs3 dbcommon-shared gtest gmock)
diff --git a/depends/storage/Makefile b/depends/storage/Makefile
index 3a2508e..668c026 100644
--- a/depends/storage/Makefile
+++ b/depends/storage/Makefile
@@ -43,6 +43,7 @@ ifeq ($(with_storage), yes)
 all: build
        cd $(top_builddir)/$(subdir)/build; mkdir -p install; \
        $(MAKE) DESTDIR=$(abs_top_builddir)/$(subdir)/build/install install
+       cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
 
 install: build
        cd $(top_builddir)/$(subdir)/build && $(MAKE) install
diff --git a/depends/univplan/Makefile b/depends/univplan/Makefile
index b0c6f47..c7f4285 100644
--- a/depends/univplan/Makefile
+++ b/depends/univplan/Makefile
@@ -43,6 +43,7 @@ ifeq ($(with_univplan), yes)
 all: build
        cd $(top_builddir)/$(subdir)/build; mkdir -p install; \
        $(MAKE) DESTDIR=$(abs_top_builddir)/$(subdir)/build/install install
+       cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
 
 install: build
        cd $(top_builddir)/$(subdir)/build && $(MAKE) install