From c095919087adc9508300ec6e9cdcd58cf147a207 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Tue, 15 Jan 2013 23:20:19 +0100 Subject: [PATCH] THRIFT-1829 cpp unit tests fail to build using multiple make jobs Patch: David Rennalls and Roger Meier --- lib/c_glib/Makefile.am | 2 +- lib/c_glib/test/Makefile.am | 2 +- lib/cpp/test/Makefile.am | 2 +- lib/py/Makefile.am | 2 +- test/cpp/Makefile.am | 1 + test/py/Makefile.am | 2 +- tutorial/cpp/Makefile.am | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 lib/c_glib/Makefile.am mode change 100644 => 100755 lib/c_glib/test/Makefile.am mode change 100644 => 100755 lib/py/Makefile.am mode change 100644 => 100755 test/py/Makefile.am diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am old mode 100644 new mode 100755 index f72ff96a..3244f748 --- a/lib/c_glib/Makefile.am +++ b/lib/c_glib/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # - +.NOTPARALLEL: SUBDIRS = . test pkgconfigdir = $(libdir)/pkgconfig diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am old mode 100644 new mode 100755 index 7f2f3e3f..7fed8e86 --- a/lib/c_glib/test/Makefile.am +++ b/lib/c_glib/test/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # - +.NOTPARALLEL: SUBDIRS = AM_CPPFLAGS = -g -Wall -I../src $(GLIB_CFLAGS) diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am index 05ee9cc2..d04cfb50 100755 --- a/lib/cpp/test/Makefile.am +++ b/lib/cpp/test/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # - +.NOTPARALLEL: noinst_LTLIBRARIES = libtestgencpp.la libprocessortest.la nodist_libtestgencpp_la_SOURCES = \ gen-cpp/DebugProtoTest_types.cpp \ diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am old mode 100644 new mode 100755 index 4a1df57c..e33bf137 --- a/lib/py/Makefile.am +++ b/lib/py/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # - +.NOTPARALLEL: DESTDIR ?= / EXTRA_DIST = setup.py setup.cfg src compat diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am index 95574fc5..ec4ba999 100755 --- a/test/cpp/Makefile.am +++ b/test/cpp/Makefile.am @@ -16,6 +16,7 @@ # specific language governing permissions and limitations # under the License. # +.NOTPARALLEL: noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la nodist_libtestgencpp_la_SOURCES = \ gen-cpp/ThriftTest_constants.cpp \ diff --git a/test/py/Makefile.am b/test/py/Makefile.am old mode 100644 new mode 100755 index 2317ef61..6b31769e --- a/test/py/Makefile.am +++ b/test/py/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # - +.NOTPARALLEL: THRIFT = $(top_srcdir)/compiler/cpp/thrift py_unit_tests = RunClientServer.py diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am index 0157b8dc..b8298459 100755 --- a/tutorial/cpp/Makefile.am +++ b/tutorial/cpp/Makefile.am @@ -16,6 +16,7 @@ # specific language governing permissions and limitations # under the License. # +.NOTPARALLEL: noinst_LTLIBRARIES = libtutorialgencpp.la nodist_libtutorialgencpp_la_SOURCES = \ gen-cpp/Calculator.cpp \ -- 2.17.1