diff options
| author | Anthony F. Molinaro <molinaro@apache.org> | 2011-03-24 16:46:22 +0000 |
|---|---|---|
| committer | Anthony F. Molinaro <molinaro@apache.org> | 2011-03-24 16:46:22 +0000 |
| commit | 5a9ca8811838f416f4fc0dbe7240a28e95c344f1 (patch) | |
| tree | a18181ad43554c5de77d1806b2e24d49f8f0a09c /test/erl | |
| parent | f2100be15b4c4e17db08c36c54ca71a9e80e33d8 (diff) | |
| download | thrift-5a9ca8811838f416f4fc0dbe7240a28e95c344f1.tar.gz | |
THRIFT-1080 : fix building of test code
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1085035 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/erl')
| -rw-r--r-- | test/erl/Makefile | 4 | ||||
| -rw-r--r-- | test/erl/src/test_client.erl | 2 | ||||
| -rw-r--r-- | test/erl/src/test_server.erl | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/test/erl/Makefile b/test/erl/Makefile index a6b5ae611..cd4c8a781 100644 --- a/test/erl/Makefile +++ b/test/erl/Makefile @@ -48,8 +48,8 @@ ${GENDIR}/: ${RPCFILE} mkdir -p ${GEN_INCLUDEDIR} mkdir -p ${GEN_SRCDIR} mkdir -p ${GEN_TARGETDIR} - mv -t ${GEN_INCLUDEDIR} gen-erl/*.hrl - mv -t ${GEN_SRCDIR} gen-erl/*.erl + mv gen-erl/*.hrl ${GEN_INCLUDEDIR} + mv gen-erl/*.erl ${GEN_SRCDIR} rm -rf gen-erl ${GEN_TARGETDIR}/: ${GENDIR}/ diff --git a/test/erl/src/test_client.erl b/test/erl/src/test_client.erl index a26467f0c..59f596dd6 100644 --- a/test/erl/src/test_client.erl +++ b/test/erl/src/test_client.erl @@ -88,7 +88,7 @@ start(Args) -> {Client11, {ok, DemoDict}} = thrift_client:call(Client10, testMap, [DemoDict]), {Client12, {ok, DemoSet}} = thrift_client:call(Client11, testSet, [DemoSet]), {Client13, {ok, [-1,2,3]}} = thrift_client:call(Client12, testList, [[-1,2,3]]), - {Client14, {ok, 1}} = thrift_client:call(Client13, testEnum, [?thriftTest_ONE]), + {Client14, {ok, 1}} = thrift_client:call(Client13, testEnum, [?thriftTest_Numberz_ONE]), {Client15, {ok, 309858235082523}} = thrift_client:call(Client14, testTypedef, [309858235082523]), % No python implementation, but works with C++ and Erlang. diff --git a/test/erl/src/test_server.erl b/test/erl/src/test_server.erl index 28d47b161..63f7b080e 100644 --- a/test/erl/src/test_server.erl +++ b/test/erl/src/test_server.erl @@ -141,19 +141,19 @@ handle_function(testInsanity, {Insanity}) when is_record(Insanity, insanity) -> i32_thing = 4, i64_thing = 4}, Crazy = #insanity{ - userMap = dict:from_list([{?thriftTest_EIGHT, 8}]), + userMap = dict:from_list([{?thriftTest_Numberz_EIGHT, 8}]), xtructs = [Goodbye] }, Looney = #insanity{ - userMap = dict:from_list([{?thriftTest_FIVE, 5}]), + userMap = dict:from_list([{?thriftTest_Numberz_FIVE, 5}]), xtructs = [Hello] }, - FirstMap = dict:from_list([{?thriftTest_TWO, Crazy}, - {?thriftTest_THREE, Crazy}]), + FirstMap = dict:from_list([{?thriftTest_Numberz_TWO, Crazy}, + {?thriftTest_Numberz_THREE, Crazy}]), - SecondMap = dict:from_list([{?thriftTest_SIX, Looney}]), + SecondMap = dict:from_list([{?thriftTest_Numberz_SIX, Looney}]), Insane = dict:from_list([{1, FirstMap}, {2, SecondMap}]), |