Repository: thrift Updated Branches: refs/heads/master aa99e0e2b -> 25c68f45d
THRIFT-2693 Erlang test leaves a lot of generated files Patch: Roger Meier Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/25c68f45 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/25c68f45 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/25c68f45 Branch: refs/heads/master Commit: 25c68f45daa4644ce4e691a78a2013289abffa46 Parents: aa99e0e Author: Roger Meier <[email protected]> Authored: Mon Sep 29 22:12:50 2014 +0200 Committer: Roger Meier <[email protected]> Committed: Mon Sep 29 22:14:30 2014 +0200 ---------------------------------------------------------------------- .gitignore | 2 ++ lib/erl/Makefile.am | 16 ++-------------- lib/erl/test/test_client.erl | 2 +- lib/erl/test/test_membuffer.erl | 2 +- lib/erl/test/test_server.erl | 2 +- lib/erl/test/test_thrift_1151.erl | 2 +- 6 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 075aac1..f183523 100644 --- a/.gitignore +++ b/.gitignore @@ -216,6 +216,8 @@ test-driver /lib/go/test/ThriftTest.thrift /test/log/ /test/test.log +/test/erl/.eunit/ +/test/erl/.generated /test/go/ThriftTest.thrift /test/go/gopath /test/go/pkg/ http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/lib/erl/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am index cdac926..60c7e5a 100644 --- a/lib/erl/Makefile.am +++ b/lib/erl/Makefile.am @@ -23,7 +23,7 @@ THRIFT_FILES = $(wildcard test/*.thrift) \ .generated: $(THRIFT_FILES) for f in $(THRIFT_FILES) ; do \ - $(THRIFT) --gen erl -out test $$f ; \ + $(THRIFT) --gen erl -o test $$f ; \ done ; \ touch .generated @@ -48,19 +48,7 @@ uninstall: clean: rm -f .generated - rm -f test/thrift1151_types.erl \ - test/thrift1151_types.hrl \ - test/thrift1151_constants.hrl \ - test/thrift1475_types.erl \ - test/thrift1475_types.hrl \ - test/thrift1475_constants.hrl \ - test/thriftTest_types.erl \ - test/thriftTest_types.hrl \ - test/thriftTest_constants.hrl \ - test/thriftTest_thrift.erl \ - test/thriftTest_thrift.hrl \ - test/secondService_thrift.erl \ - test/secondService_thrift.hrl + rm -rf test/gen-erl/ ./rebar clean maintainer-clean-local: http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/lib/erl/test/test_client.erl ---------------------------------------------------------------------- diff --git a/lib/erl/test/test_client.erl b/lib/erl/test/test_client.erl index 59f596d..79708ca 100644 --- a/lib/erl/test/test_client.erl +++ b/lib/erl/test/test_client.erl @@ -21,7 +21,7 @@ -export([start/0, start/1]). --include("thriftTest_types.hrl"). +-include("gen-erl/thriftTest_types.hrl"). -record(options, {port = 9090, client_opts = []}). http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/lib/erl/test/test_membuffer.erl ---------------------------------------------------------------------- diff --git a/lib/erl/test/test_membuffer.erl b/lib/erl/test/test_membuffer.erl index 7a01143..8892df0 100644 --- a/lib/erl/test/test_membuffer.erl +++ b/lib/erl/test/test_membuffer.erl @@ -22,7 +22,7 @@ -ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). --include("thriftTest_types.hrl"). +-include("gen-erl/thriftTest_types.hrl"). test_data() -> #xtruct { http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/lib/erl/test/test_server.erl ---------------------------------------------------------------------- diff --git a/lib/erl/test/test_server.erl b/lib/erl/test/test_server.erl index 63f7b08..8cabd6f 100644 --- a/lib/erl/test/test_server.erl +++ b/lib/erl/test/test_server.erl @@ -21,7 +21,7 @@ -export([go/0, go/1, start_link/2, handle_function/2]). --include("thriftTest_types.hrl"). +-include("gen-erl/thriftTest_types.hrl"). -record(options, {port = 9090, server_opts = []}). http://git-wip-us.apache.org/repos/asf/thrift/blob/25c68f45/lib/erl/test/test_thrift_1151.erl ---------------------------------------------------------------------- diff --git a/lib/erl/test/test_thrift_1151.erl b/lib/erl/test/test_thrift_1151.erl index 9cee486..8b1d937 100644 --- a/lib/erl/test/test_thrift_1151.erl +++ b/lib/erl/test/test_thrift_1151.erl @@ -1,6 +1,6 @@ -module(test_thrift_1151). --include("thrift1151_types.hrl"). +-include("gen-erl/thrift1151_types.hrl"). -ifdef(TEST). -include_lib("eunit/include/eunit.hrl").
