hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject incubator-hawq git commit: HAWQ-754. Open googletest build inside hawq for test usage.
Date Wed, 25 May 2016 02:58:16 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 72f5302b0 -> 99fc55fd4


HAWQ-754. Open googletest build inside hawq for test usage.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/99fc55fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/99fc55fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/99fc55fd

Branch: refs/heads/master
Commit: 99fc55fd4dc2bafbccc45f8d89f0d6300c4d2ec6
Parents: 72f5302
Author: xunzhang <xunzhangthu@gmail.com>
Authored: Wed May 25 10:30:25 2016 +0800
Committer: xunzhang <xunzhangthu@gmail.com>
Committed: Wed May 25 10:45:28 2016 +0800

----------------------------------------------------------------------
 .travis.yml                     |  5 ++---
 GNUmakefile.in                  | 12 ++++--------
 configure                       |  2 +-
 configure.in                    |  2 +-
 depends/libhdfs3/CMakeLists.txt |  2 +-
 depends/libyarn/CMakeLists.txt  |  2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index bc4ba2b..c948c86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,9 +44,8 @@ before_script:
 
 script:
   - make -j2
-# waiting higher version of gcc ready
-#- make feature-test
-#- make feature-test-clean
+  - make feature-test
+  - make feature-test-clean
 
 branches:
   except:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/GNUmakefile.in
----------------------------------------------------------------------
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6875cf6..49bfbd3 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,8 +10,7 @@ include $(top_builddir)/src/Makefile.global
 
 all:
 #	$(MAKE) -C doc $@
-# waiting for higher version of gcc ready
-#$(MAKE) -C depends/thirdparty/googletest $@
+	$(MAKE) -C depends/thirdparty/googletest $@
 	$(MAKE) -C depends/thirdparty/thrift/hawqbuild $@
 	$(MAKE) -C depends/libhdfs3 $@
 	$(MAKE) -C depends/libyarn $@
@@ -23,8 +22,7 @@ all:
 
 install:
 #	$(MAKE) -C doc $@
-# waiting for higher version of gcc ready
-#$(MAKE) -C depends/thirdparty/googletest install
+	$(MAKE) -C depends/thirdparty/googletest $@ 
 	$(MAKE) -C depends/thirdparty/thrift/hawqbuild $@
 	$(MAKE) -C depends/libhdfs3 $@
 	$(MAKE) -C depends/libyarn $@
@@ -57,8 +55,7 @@ feature-test-clean:
 clean:
 #	$(MAKE) -C doc $@
 	$(MAKE) -C contrib $@
-# waiting for higher version of gcc ready
-#-$(MAKE) -C depends/thirdparty/googletest $@
+	-$(MAKE) -C depends/thirdparty/googletest $@ 
 	-$(MAKE) -C depends/thirdparty/thrift/hawqbuild $@
 	-$(MAKE) -C depends/libhdfs3 $@
 	-$(MAKE) -C depends/libyarn $@
@@ -75,8 +72,7 @@ clean:
 distclean maintainer-clean:
 #	-$(MAKE) -C doc $@
 	-$(MAKE) -C contrib $@
-# waiting for higher version of gcc ready
-#-$(MAKE) -C depends/thirdparty/googletest $@
+	-$(MAKE) -C depends/thirdparty/googletest $@ 
 	-$(MAKE) -C depends/thirdparty/thrift/hawqbuild $@
 	-$(MAKE) -C depends/libhdfs3 $@
 	-$(MAKE) -C depends/libyarn $@

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 5aa3d6a..2760ca7 100755
--- a/configure
+++ b/configure
@@ -1556,7 +1556,7 @@ Optional Packages:
   --with-bonjour          build with Bonjour support
   --with-openssl          build with OpenSSL support
   --without-readline      do not use GNU Readline nor BSD Libedit for editing
-  --with-thrift       do not build thrift
+  --with-thrift           build thrift
   --without-libyarn       do not build libyarn
   --without-libhdfs3      do not build libhdfs3
   --without-libedit-preferred  Don't prefer BSD Libedit over GNU Readline

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/configure.in
----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index ee04770..009d411 100644
--- a/configure.in
+++ b/configure.in
@@ -817,7 +817,7 @@ fi
 # thrift
 #
 PGAC_ARG_BOOL(with, thrift, no,
-              [  --with-thrift       do not build thrift])
+              [  --with-thrift           build thrift])
 AC_SUBST(with_thrift)
 
 #

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/depends/libhdfs3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/CMakeLists.txt b/depends/libhdfs3/CMakeLists.txt
index 31b6601..0700861 100644
--- a/depends/libhdfs3/CMakeLists.txt
+++ b/depends/libhdfs3/CMakeLists.txt
@@ -21,7 +21,7 @@ FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(Protobuf REQUIRED)
 FIND_PACKAGE(KERBEROS REQUIRED)
 FIND_PACKAGE(GSasl REQUIRED)
-#FIND_PACKAGE(GoogleTest REQUIRED)
+FIND_PACKAGE(GoogleTest REQUIRED)
 
 IF(OS_LINUX)
     FIND_PACKAGE(LibUUID REQUIRED)

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/99fc55fd/depends/libyarn/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/depends/libyarn/CMakeLists.txt b/depends/libyarn/CMakeLists.txt
index a9a7637..e323472 100644
--- a/depends/libyarn/CMakeLists.txt
+++ b/depends/libyarn/CMakeLists.txt
@@ -21,7 +21,7 @@ FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(Protobuf REQUIRED)
 FIND_PACKAGE(KERBEROS REQUIRED)
 FIND_PACKAGE(GSasl REQUIRED)
-#FIND_PACKAGE(GoogleTest REQUIRED)
+FIND_PACKAGE(GoogleTest REQUIRED)
 
 ADD_SUBDIRECTORY(mock)
 ADD_SUBDIRECTORY(src)


Mime
View raw message