THRIFT-1080 : fix building of test code
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1085035 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/erl/Makefile b/test/erl/Makefile
index a6b5ae6..cd4c8a7 100644
--- a/test/erl/Makefile
+++ b/test/erl/Makefile
@@ -48,8 +48,8 @@
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 a26467f..59f596d 100644
--- a/test/erl/src/test_client.erl
+++ b/test/erl/src/test_client.erl
@@ -88,7 +88,7 @@
{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 28d47b1..63f7b08 100644
--- a/test/erl/src/test_server.erl
+++ b/test/erl/src/test_server.erl
@@ -141,19 +141,19 @@
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}]),