Repository: thrift
Updated Branches:
  refs/heads/master 208738a6e -> a0c5ab711


THRIFT-2971 - C++ test and tutorial parallel build is unstable


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a0c5ab71
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a0c5ab71
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a0c5ab71

Branch: refs/heads/master
Commit: a0c5ab711ef47142ca8abb55bc1d4ba139ef8129
Parents: 208738a
Author: Nobuaki Sukegawa <[email protected]>
Authored: Sun Feb 1 00:27:12 2015 +0900
Committer: Roger Meier <[email protected]>
Committed: Mon Feb 2 22:06:39 2015 +0100

----------------------------------------------------------------------
 lib/cpp/test/Makefile.am | 10 ++++++++++
 test/cpp/Makefile.am     |  7 +++++++
 tutorial/cpp/Makefile.am |  3 +++
 3 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/a0c5ab71/lib/cpp/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index d0675cf..43c5975 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -18,6 +18,16 @@
 #
 AUTOMAKE_OPTIONS = subdir-objects serial-tests
 
+BUILT_SOURCES = gen-cpp/DebugProtoTest_types.h \
+                gen-cpp/EnumTest_types.h \
+                gen-cpp/OptionalRequiredTest_types.h \
+                gen-cpp/Recursive_types.h \
+                gen-cpp/ThriftTest_types.h \
+                gen-cpp/TypedefTest_types.h \
+                gen-cpp/ChildService.h \
+                gen-cpp/ParentService.h \
+                gen-cpp/proc_types.h
+
 noinst_LTLIBRARIES = libtestgencpp.la libprocessortest.la
 nodist_libtestgencpp_la_SOURCES = \
        gen-cpp/DebugProtoTest_types.cpp \

http://git-wip-us.apache.org/repos/asf/thrift/blob/a0c5ab71/test/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 90aa563..7d57f5c 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -18,6 +18,13 @@
 #
 AUTOMAKE_OPTIONS = subdir-objects serial-tests
 
+BUILT_SOURCES = gen-cpp/ThriftTest.cpp \
+                gen-cpp/ThriftTest_types.cpp \
+                gen-cpp/ThriftTest_constants.cpp \
+                gen-cpp/StressTest_types.cpp \
+                gen-cpp/StressTest_constants.cpp \
+                gen-cpp/Service.cpp
+
 noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
 nodist_libtestgencpp_la_SOURCES = \
        gen-cpp/ThriftTest_constants.cpp \

http://git-wip-us.apache.org/repos/asf/thrift/blob/a0c5ab71/tutorial/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
index 3b38240..9bc6318 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -18,6 +18,9 @@
 #
 AUTOMAKE_OPTIONS = subdir-objects serial-tests
 
+BUILT_SOURCES = gen-cpp/shared_types.cpp \
+                gen-cpp/tutorial_types.cpp
+
 noinst_LTLIBRARIES = libtutorialgencpp.la
 nodist_libtutorialgencpp_la_SOURCES = \
        gen-cpp/Calculator.cpp \

Reply via email to