THRIFT-1003 Polishing c_glib code
Patch: Anatol Pomozov
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1039299 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index a8889be..e9f070e 100644
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -6,25 +6,9 @@
CFLAGS = @GCOV_CFLAGS@
CXXFLAGS = -g
-check_SCRIPTS = \
- testwrapper-testtransportsocket \
- testwrapper-testprotocolbinary \
- testwrapper-testbufferedtransport \
- testwrapper-testframedtransport \
- testwrapper-testmemorybuffer \
- testwrapper-teststruct \
- testwrapper-testsimpleserver \
- testwrapper-testdebugproto \
- testwrapper-testoptionalrequired \
- testwrapper-testthrifttest
-
-if WITH_CPP
- check_SCRIPTS += testwrapper-testthrifttestclient
-endif
-
check_PROGRAMS = \
testtransportsocket \
- testprotocolbinary \
+ testbinaryprotocol \
testbufferedtransport \
testframedtransport \
testmemorybuffer \
@@ -44,8 +28,8 @@
../libthrift_c_glib_la-thrift_server_transport.o \
../libthrift_c_glib_la-thrift_server_socket.o
-testprotocolbinary_SOURCES = testprotocolbinary.c
-testprotocolbinary_LDADD = \
+testbinaryprotocol_SOURCES = testbinaryprotocol.c
+testbinaryprotocol_LDADD = \
../libthrift_c_glib_la-thrift_protocol.o \
../libthrift_c_glib_la-thrift_transport.o \
../libthrift_c_glib_la-thrift_socket.o \
@@ -158,9 +142,7 @@
gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest.h: ../../../test/ThriftTest.thrift
$(THRIFT) --gen cpp $<
-
TESTS = \
- $(testwrapper-%) \
$(check_PROGRAMS) \
$(check_SCRIPTS)
@@ -212,18 +194,13 @@
${VALGRIND_LEAK_OPTS} \
${$<_VALGRIND_LEAK_OPTS} ./$<
-testwrapper-%: % test-wrapper.sh
- @ln -sf test-wrapper.sh $@
-
clean-local:
$(RM) -r gen-c_glib gen-cpp
CLEANFILES = \
- testwrapper-* \
*.bb \
*.bbg \
*.da \
*.gcno \
*.gcda \
- *.gcov \
- test-wrapper.sh
+ *.gcov