Move ConflictingNamesTest to lib/go/test
Client: go
Also add missing copyright header for files added in
https://github.com/apache/thrift/pull/2307.
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 2f748c6..4be652e 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -46,7 +46,9 @@
ConflictNamespaceTestD.thrift \
ConflictNamespaceTestSuperThing.thrift \
ConflictNamespaceServiceTest.thrift \
- DuplicateImportsTest.thrift
+ DuplicateImportsTest.thrift \
+ EqualsTest.thrift \
+ ConflictArgNamesTest.thrift
mkdir -p gopath/src
grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
$(THRIFT) $(THRIFTARGS) -r IncludesTest.thrift
@@ -74,6 +76,7 @@
$(THRIFT) $(THRIFTARGS) ConflictNamespaceServiceTest.thrift
$(THRIFT) $(THRIFTARGS) -r DuplicateImportsTest.thrift
$(THRIFT) $(THRIFTARGS) EqualsTest.thrift
+ $(THRIFT) $(THRIFTARGS) ConflictArgNamesTest.thrift
GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock || true
sed -i 's/\"context\"/\"golang.org\/x\/net\/context\"/g' gopath/src/github.com/golang/mock/gomock/controller.go || true
GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock
@@ -99,7 +102,8 @@
conflict/context/conflict_service-remote \
servicestest/container_test-remote \
duplicateimportstest \
- equalstest
+ equalstest \
+ conflictargnamestest
GOPATH=`pwd`/gopath $(GO) test thrift tests dontexportrwtest
clean-local:
@@ -113,6 +117,7 @@
tests \
common \
BinaryKeyTest.thrift \
+ ConflictArgNamesTest.thrift \
ConflictNamespaceServiceTest.thrift \
ConflictNamespaceTestA.thrift \
ConflictNamespaceTestB.thrift \