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 2016/05/11 03:06:51 UTC
incubator-hawq git commit: HAWQ-727. Fix featuretest makefile error.
Repository: incubator-hawq
Updated Branches:
refs/heads/master 5a3f69976 -> 02411abad
HAWQ-727. Fix featuretest makefile error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/02411aba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/02411aba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/02411aba
Branch: refs/heads/master
Commit: 02411abad13329f216ff48bc6e6cde246fa36744
Parents: 5a3f699
Author: hzhang2 <zh...@163.com>
Authored: Wed May 11 11:03:04 2016 +0800
Committer: hzhang2 <zh...@163.com>
Committed: Wed May 11 11:06:01 2016 +0800
----------------------------------------------------------------------
GNUmakefile.in | 2 +-
configure.in | 2 +-
src/Makefile | 4 ++--
src/test/Makefile | 4 +++-
src/test/feature/lib/hawq-config.cpp | 1 +
src/test/feature/lib/string-util.cpp | 2 +-
src/test/feature/lib/xml-parser.cpp | 1 +
7 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/GNUmakefile.in
----------------------------------------------------------------------
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4da5951..d38273c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -86,8 +86,8 @@ distclean maintainer-clean:
-$(MAKE) -C depends/libyarn $@
-$(MAKE) -C config $@
-$(MAKE) -C tools $@
+ -$(MAKE) -C src feature_test clean
-$(MAKE) -C src $@
- $(MAKE) -C src feature_test clean
-rm -f config.cache config.log config.status GNUmakefile
# Garbage from autoconf:
@rm -rf autom4te.cache/
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/configure.in
----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index d2459b8..391e17e 100644
--- a/configure.in
+++ b/configure.in
@@ -2058,7 +2058,7 @@ fi
AC_SUBST(vpath_build)
-AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global])
+AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk src/Makefile.global depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global])
AC_CONFIG_LINKS([
src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/Makefile
----------------------------------------------------------------------
diff --git a/src/Makefile b/src/Makefile
index 866a9bf..2b08a89 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -63,7 +63,7 @@ clean:
$(MAKE) -C tutorial NO_PGXS=1 $@
$(MAKE) -C test/thread $@
$(MAKE) -C test/regress $@
- $(MAKE) -C test/feature/example $@
+ $(MAKE) -C test/feature $@
$(MAKE) -C tools/fsync $@
distclean maintainer-clean:
@@ -80,7 +80,7 @@ distclean maintainer-clean:
$(MAKE) -C tutorial NO_PGXS=1 $@
$(MAKE) -C test/thread $@
$(MAKE) -C test/regress $@
- $(MAKE) -C test/feature/example clean
+ $(MAKE) -C test/feature clean
$(MAKE) -C tools/fsync $@
rm -f Makefile.port Makefile.global
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/Makefile
----------------------------------------------------------------------
diff --git a/src/test/Makefile b/src/test/Makefile
index ba4e729..9bc9b5c 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -14,10 +14,12 @@
#.DEFAULT:
# $(MAKE) -C regress $@
-.PHONY: feature_test clean
+.PHONY: feature_test clean distclean
feature_test:
$(MAKE) -C feature all
clean:
$(MAKE) -C feature clean
+
+distclean: clean
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/feature/lib/hawq-config.cpp
----------------------------------------------------------------------
diff --git a/src/test/feature/lib/hawq-config.cpp b/src/test/feature/lib/hawq-config.cpp
index d973328..263e54a 100644
--- a/src/test/feature/lib/hawq-config.cpp
+++ b/src/test/feature/lib/hawq-config.cpp
@@ -5,6 +5,7 @@
#include <set>
#include <string>
#include <vector>
+#include <unistd.h>
#include "command.h"
#include "psql.h"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/feature/lib/string-util.cpp
----------------------------------------------------------------------
diff --git a/src/test/feature/lib/string-util.cpp b/src/test/feature/lib/string-util.cpp
index 4474c80..e4bb7f5 100644
--- a/src/test/feature/lib/string-util.cpp
+++ b/src/test/feature/lib/string-util.cpp
@@ -42,7 +42,7 @@ std::string StringUtil::lower(const std::string &str) {
result.append(&c, sizeof(char));
}
- return std::move(result);
+ return result;
}
std::string &StringUtil::trim(std::string &s) { // NOLINT
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/feature/lib/xml-parser.cpp
----------------------------------------------------------------------
diff --git a/src/test/feature/lib/xml-parser.cpp b/src/test/feature/lib/xml-parser.cpp
index 7d19721..69fdd44 100644
--- a/src/test/feature/lib/xml-parser.cpp
+++ b/src/test/feature/lib/xml-parser.cpp
@@ -1,6 +1,7 @@
#include "xml-parser.h"
#include <limits>
+#include <unistd.h>
XmlConfig::XmlConfig(const char *p) :
path(p) {