summaryrefslogtreecommitdiff
path: root/test/erl
diff options
context:
space:
mode:
authorJens Geyer <jensg@apache.org>2014-12-29 23:56:12 +0100
committerJens Geyer <jensg@apache.org>2014-12-29 23:56:12 +0100
commit326cf0d0fbb6ef79358500b17fa0a9327d2e6df9 (patch)
tree4f5c6043cca90762ac6f0808b93211735aff463d /test/erl
parent8c8e9c6a555f3b7f57cf1f214242918f2343ebbd (diff)
downloadthrift-326cf0d0fbb6ef79358500b17fa0a9327d2e6df9.tar.gz
THRIFT-2920 Erlang Thrift test uses wrong IDL file
Client: Erlang Patch: Jens Geyer
Diffstat (limited to 'test/erl')
-rw-r--r--test/erl/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/erl/Makefile.am b/test/erl/Makefile.am
index 309d07e2d..cfea7f97a 100644
--- a/test/erl/Makefile.am
+++ b/test/erl/Makefile.am
@@ -27,6 +27,8 @@ THRIFT_FILES = $(wildcard ../*.thrift)
$(THRIFT) --gen erl $$f ; \
done ; \
$(THRIFT) --gen erl:legacynames LegacyNames.thrift
+ # make sure ThriftTest.thrift is generated last to prevent conflicts with other *.thrift files
+ $(THRIFT) --gen erl ../ThriftTest.thrift
touch .generated
check: .generated