You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2019/04/10 03:54:35 UTC
[hawq] branch master updated: HAWQ-1694. fix dbcommon, univplan,
storage ut couldn't run issue
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 f4f9794 HAWQ-1694. fix dbcommon,univplan,storage ut couldn't run issue
f4f9794 is described below
commit f4f97947dabd8720bc37804ca7200d2b1424efd5
Author: oushu1tuyu1 <tu...@oushu.io>
AuthorDate: Wed Apr 10 11:21:46 2019 +0800
HAWQ-1694. fix dbcommon,univplan,storage ut couldn't run issue
---
GNUmakefile.in | 5 +++++
depends/dbcommon/Makefile | 4 +++-
depends/dbcommon/test/unit/CMakeLists.txt | 2 +-
depends/storage/Makefile | 4 +++-
depends/univplan/Makefile | 4 +++-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index d23cdee..db8e53f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -58,6 +58,11 @@ rpm:
$(MAKE) -C ranger-plugin $@
$(MAKE) -C contrib/hawq-package rpm-tarball
+unittest:
+ $(MAKE) -C depends/dbcommon $@
+ $(MAKE) -C depends/univplan $@
+ $(MAKE) -C depends/storage $@
+
feature-test:
$(MAKE) -C src feature-test
diff --git a/depends/dbcommon/Makefile b/depends/dbcommon/Makefile
index 8ea4330..f27fab2 100644
--- a/depends/dbcommon/Makefile
+++ b/depends/dbcommon/Makefile
@@ -44,11 +44,13 @@ 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
+unittest:
+ cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
+
distclean:
rm -rf $(top_builddir)/$(subdir)/build
diff --git a/depends/dbcommon/test/unit/CMakeLists.txt b/depends/dbcommon/test/unit/CMakeLists.txt
index 326d21c..326de83 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} hdfs3 dbcommon-shared gtest gmock)
+target_link_libraries(unit ${CLANG_LDFLAGS} dbcommon-shared gtest gmock)
diff --git a/depends/storage/Makefile b/depends/storage/Makefile
index 668c026..4551c77 100644
--- a/depends/storage/Makefile
+++ b/depends/storage/Makefile
@@ -43,11 +43,13 @@ 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
+unittest:
+ cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
+
distclean:
rm -rf $(top_builddir)/$(subdir)/build
diff --git a/depends/univplan/Makefile b/depends/univplan/Makefile
index c7f4285..25e8a4d 100644
--- a/depends/univplan/Makefile
+++ b/depends/univplan/Makefile
@@ -43,11 +43,13 @@ 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
+unittest:
+ cd $(top_builddir)/$(subdir)/build/test && $(MAKE) unittest
+
distclean:
rm -rf $(top_builddir)/$(subdir)/build