THRIFT-2768: Whitespace Fixup
Client: General (Makefile.am, *.thrift)
Patch: Jens Geyer
DocTest.thrift has NOT been changed, the trailing whitespaces are part of the test case.
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 3dbcaaa..d1086c0 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -19,94 +19,94 @@
.NOTPARALLEL:
noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
nodist_libtestgencpp_la_SOURCES = \
- gen-cpp/ThriftTest_constants.cpp \
- gen-cpp/ThriftTest_constants.h \
- gen-cpp/ThriftTest_types.cpp \
- gen-cpp/ThriftTest_types.h \
- gen-cpp/ThriftTest_types.tcc \
- gen-cpp/ThriftTest.cpp \
- gen-cpp/ThriftTest.h \
- gen-cpp/ThriftTest.tcc \
- src/ThriftTest_extras.cpp
+ gen-cpp/ThriftTest_constants.cpp \
+ gen-cpp/ThriftTest_constants.h \
+ gen-cpp/ThriftTest_types.cpp \
+ gen-cpp/ThriftTest_types.h \
+ gen-cpp/ThriftTest_types.tcc \
+ gen-cpp/ThriftTest.cpp \
+ gen-cpp/ThriftTest.h \
+ gen-cpp/ThriftTest.tcc \
+ src/ThriftTest_extras.cpp
libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
nodist_libstresstestgencpp_la_SOURCES = \
- gen-cpp/StressTest_constants.cpp \
- gen-cpp/StressTest_types.cpp \
- gen-cpp/StressTest_constants.h \
- gen-cpp/StressTest_types.h \
- gen-cpp/Service.cpp \
- gen-cpp/Service.h
+ gen-cpp/StressTest_constants.cpp \
+ gen-cpp/StressTest_types.cpp \
+ gen-cpp/StressTest_constants.h \
+ gen-cpp/StressTest_types.h \
+ gen-cpp/Service.cpp \
+ gen-cpp/Service.h
libstresstestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
check_PROGRAMS = \
- TestServer \
- TestClient \
- StressTest \
- StressTestNonBlocking
+ TestServer \
+ TestClient \
+ StressTest \
+ StressTestNonBlocking
# we currently do not run the testsuite, stop c++ server issue
# TESTS = \
-# $(check_PROGRAMS)
+# $(check_PROGRAMS)
TestServer_SOURCES = \
- src/TestServer.cpp
+ src/TestServer.cpp
TestServer_LDADD = \
- libtestgencpp.la \
- $(top_builddir)/lib/cpp/libthrift.la \
- $(top_builddir)/lib/cpp/libthriftz.la \
- $(top_builddir)/lib/cpp/libthriftnb.la \
- -levent -lboost_program_options -lboost_system -lboost_filesystem
+ libtestgencpp.la \
+ $(top_builddir)/lib/cpp/libthrift.la \
+ $(top_builddir)/lib/cpp/libthriftz.la \
+ $(top_builddir)/lib/cpp/libthriftnb.la \
+ -levent -lboost_program_options -lboost_system -lboost_filesystem
TestClient_SOURCES = \
- src/TestClient.cpp
+ src/TestClient.cpp
TestClient_LDADD = \
- libtestgencpp.la \
- $(top_builddir)/lib/cpp/libthrift.la \
- $(top_builddir)/lib/cpp/libthriftz.la \
- $(top_builddir)/lib/cpp/libthriftnb.la \
- -levent -lboost_program_options -lboost_system -lboost_filesystem
+ libtestgencpp.la \
+ $(top_builddir)/lib/cpp/libthrift.la \
+ $(top_builddir)/lib/cpp/libthriftz.la \
+ $(top_builddir)/lib/cpp/libthriftnb.la \
+ -levent -lboost_program_options -lboost_system -lboost_filesystem
StressTest_SOURCES = \
- src/StressTest.cpp
+ src/StressTest.cpp
StressTest_LDADD = \
- libstresstestgencpp.la \
- $(top_builddir)/lib/cpp/libthrift.la
+ libstresstestgencpp.la \
+ $(top_builddir)/lib/cpp/libthrift.la
StressTestNonBlocking_SOURCES = \
- src/StressTestNonBlocking.cpp
+ src/StressTestNonBlocking.cpp
StressTestNonBlocking_LDADD = \
- libstresstestgencpp.la \
- $(top_builddir)/lib/cpp/libthriftnb.la \
- -levent
+ libstresstestgencpp.la \
+ $(top_builddir)/lib/cpp/libthriftnb.la \
+ -levent
#
# Common thrift code generation rules
#
THRIFT = $(top_builddir)/compiler/cpp/thrift
gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift
- $(THRIFT) --gen cpp:templates,cob_style -r $<
+ $(THRIFT) --gen cpp:templates,cob_style -r $<
gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp: $(top_srcdir)/test/StressTest.thrift
- $(THRIFT) --gen cpp $<
+ $(THRIFT) --gen cpp $<
AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
AM_CXXFLAGS = -Wall
AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
clean-local:
- $(RM) -r gen-cpp
+ $(RM) -r gen-cpp
EXTRA_DIST = \
- src/TestClient.cpp \
- src/TestServer.cpp \
- src/StressTest.cpp \
- src/StressTestNonBlocking.cpp \
- realloc/realloc_test.c \
- realloc/Makefile
+ src/TestClient.cpp \
+ src/TestServer.cpp \
+ src/StressTest.cpp \
+ src/StressTestNonBlocking.cpp \
+ realloc/realloc_test.c \
+ realloc/Makefile