You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hawq.apache.org by xunzhang <gi...@git.apache.org> on 2016/05/16 03:48:16 UTC
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
GitHub user xunzhang opened a pull request:
https://github.com/apache/incubator-hawq/pull/656
HAWQ-734. Refactor feature test build and some bugfix
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/xunzhang/incubator-hawq HAWQ-734
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-hawq/pull/656.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #656
----
commit caf161a35af4bd9ae817776e399e49d42dccfddd
Author: xunzhang <xu...@gmail.com>
Date: 2016-05-16T03:46:04Z
HAWQ-734. Refactor feature test build and some bugfix
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by xunzhang <gi...@git.apache.org>.
Github user xunzhang commented on the pull request:
https://github.com/apache/incubator-hawq/pull/656#issuecomment-219343154
cc @huor
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by wengyanqing <gi...@git.apache.org>.
Github user wengyanqing commented on the pull request:
https://github.com/apache/incubator-hawq/pull/656#issuecomment-219357251
+1
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by xunzhang <gi...@git.apache.org>.
Github user xunzhang commented on a diff in the pull request:
https://github.com/apache/incubator-hawq/pull/656#discussion_r63314107
--- Diff: src/test/feature/lib/sql-util.cpp ---
@@ -79,7 +79,7 @@ void SQLUtility::execSQLFile(const std::string &sqlFile,
std::unique_ptr<PSQL> SQLUtility::getConnection() {
std::unique_ptr<PSQL> psql(
new PSQL(HAWQ_DB, HAWQ_HOST, HAWQ_PORT, HAWQ_USER, HAWQ_PASSWORD));
- return std::move(psql);
+ return psql;
--- End diff --
ok, modified back.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-hawq/pull/656
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by xunzhang <gi...@git.apache.org>.
Github user xunzhang commented on the pull request:
https://github.com/apache/incubator-hawq/pull/656#issuecomment-219343093
cc @wengyanqing @ztao1987 @zhangh43
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by ztao1987 <gi...@git.apache.org>.
Github user ztao1987 commented on a diff in the pull request:
https://github.com/apache/incubator-hawq/pull/656#discussion_r63313943
--- Diff: src/test/feature/lib/sql-util.cpp ---
@@ -79,7 +79,7 @@ void SQLUtility::execSQLFile(const std::string &sqlFile,
std::unique_ptr<PSQL> SQLUtility::getConnection() {
std::unique_ptr<PSQL> psql(
new PSQL(HAWQ_DB, HAWQ_HOST, HAWQ_PORT, HAWQ_USER, HAWQ_PASSWORD));
- return std::move(psql);
+ return psql;
--- End diff --
Here I returned pointer ownership, otherwise this memory will be deleted by unique pointer
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by huor <gi...@git.apache.org>.
Github user huor commented on a diff in the pull request:
https://github.com/apache/incubator-hawq/pull/656#discussion_r63312102
--- Diff: src/test/feature/Makefile ---
@@ -1,32 +1,28 @@
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-#.DEFAULT:
-#$(MAKE) -C lib $@
-
-include $(top_builddir)/src/Makefile.global
-
-gtest_include = $(top_builddir)/depends/thirdparty/googletest/googletest/include
-gmock_include = $(top_builddir)/depends/thirdparty/googletest/googlemock/include
-gtest_lib_path = $(top_builddir)/depends/thirdparty/googletest/build/googlemock
-gmock_lib_path = $(top_builddir)/depends/thirdparty/googletest/build/googlemock/gtest
+gtest_include = $(abs_top_srcdir)/depends/thirdparty/googletest/googletest/include
+gmock_include = $(abs_top_srcdir)/depends/thirdparty/googletest/googlemock/include
+gtest_lib_path = $(abs_top_srcdir)/depends/thirdparty/googletest/build/googlemock
+gmock_lib_path = $(abs_top_srcdir)/depends/thirdparty/googletest/build/googlemock/gtest
+override CXX = g++
override CXXFLAGS = -Wall -O0 -g -std=c++11
-override CPPFLAGS := -I/usr/include -I/usr/local/include -I/usr/include/libxml2 -I$(top_builddir)/src/test/feature/ -I$(top_builddir)/src/test/feature/lib/ -I$(top_builddir)/src/interfaces/libpq -I$(top_builddir)/src/interfaces -I$(top_builddir)/src/include -I$(gtest_include) -I$(gmock_include)
-
+override CPPFLAGS := -I/usr/include -I/usr/local/include -I/usr/include/libxml2 -I$(abs_top_srcdir)/src/test/feature/ -I$(abs_top_srcdir)/src/test/feature/lib/ -I$(abs_top_srcdir)/src/interfaces/libpq -I$(abs_top_srcdir)/src/interfaces -I$(abs_top_srcdir)/src/include -I$(gtest_include) -I$(gmock_include)
override LIBS := $(LIBS) -lgtest -lpq -lxml2 -ltest
-override LDFLAGS += -L/usr/local/lib -L/usr/lib -L$(top_builddir)/src/test/feature/lib -L$(gtest_lib_path) -L$(gmock_lib_path)
+override LDFLAGS += -L/usr/local/lib -L/usr/lib -L$(abs_top_srcdir)/src/test/feature/lib -L$(gtest_lib_path) -L$(gmock_lib_path)
-PROG = test-main.cpp testlib/test-lib.cpp
+PROG = test-main.cpp $(wildcard testlib/*.cpp)
--- End diff --
It is possible to make the wildcard to include all test folders? i.e., "+PROG = test-main.cpp $(wildcard */*.cpp)"
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-hawq pull request: HAWQ-734. Refactor feature test build...
Posted by ztao1987 <gi...@git.apache.org>.
Github user ztao1987 commented on the pull request:
https://github.com/apache/incubator-hawq/pull/656#issuecomment-219357368
+1
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---