From 61e0ce93f586a8b39069c179773c3a646e743b88 Mon Sep 17 00:00:00 2001 From: AICells <1713699517@qq.com> Date: Fri, 17 Jul 2020 01:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools_cq => dynamicCompile}/mmake.erl | 0 src/{srvNodeMgr/tools_cq => hotUpdate}/h.erl | 0 src/{dynamicCompile => hotUpdate}/reloader.erl | 0 .../reloader.erl => hotUpdate/reloader1.erl} | 2 +- .../tools/gameWorld/test/tools => hotUpdate}/u.erl | 0 src/{srvNodeMgr/u.erl => hotUpdate/u1.erl} | 2 +- .../tools_cq/u.erl => hotUpdate/u2.erl} | 2 +- src/testCase/utFunCallCase.erl | 11 ++++++----- src/testCase/utTestPerformance.erl | 12 ++++++++++++ src/testCase/utTryCatchCase.erl | 14 ++++++++++++++ 10 files changed, 35 insertions(+), 8 deletions(-) rename src/{srvNodeMgr/tools_cq => dynamicCompile}/mmake.erl (100%) rename src/{srvNodeMgr/tools_cq => hotUpdate}/h.erl (100%) rename src/{dynamicCompile => hotUpdate}/reloader.erl (100%) rename src/{srvNodeMgr/reloader.erl => hotUpdate/reloader1.erl} (99%) rename src/{srvNodeMgr/tools/gameWorld/test/tools => hotUpdate}/u.erl (100%) rename src/{srvNodeMgr/u.erl => hotUpdate/u1.erl} (99%) rename src/{srvNodeMgr/tools_cq/u.erl => hotUpdate/u2.erl} (99%) diff --git a/src/srvNodeMgr/tools_cq/mmake.erl b/src/dynamicCompile/mmake.erl similarity index 100% rename from src/srvNodeMgr/tools_cq/mmake.erl rename to src/dynamicCompile/mmake.erl diff --git a/src/srvNodeMgr/tools_cq/h.erl b/src/hotUpdate/h.erl similarity index 100% rename from src/srvNodeMgr/tools_cq/h.erl rename to src/hotUpdate/h.erl diff --git a/src/dynamicCompile/reloader.erl b/src/hotUpdate/reloader.erl similarity index 100% rename from src/dynamicCompile/reloader.erl rename to src/hotUpdate/reloader.erl diff --git a/src/srvNodeMgr/reloader.erl b/src/hotUpdate/reloader1.erl similarity index 99% rename from src/srvNodeMgr/reloader.erl rename to src/hotUpdate/reloader1.erl index 9f723cd..f92d8c6 100644 --- a/src/srvNodeMgr/reloader.erl +++ b/src/hotUpdate/reloader1.erl @@ -4,7 +4,7 @@ %% @doc Erlang module for automatically reloading modified modules %% during development. --module(reloader). +-module(reloader1). -author("Matthew Dempsky "). -include_lib("kernel/include/file.hrl"). diff --git a/src/srvNodeMgr/tools/gameWorld/test/tools/u.erl b/src/hotUpdate/u.erl similarity index 100% rename from src/srvNodeMgr/tools/gameWorld/test/tools/u.erl rename to src/hotUpdate/u.erl diff --git a/src/srvNodeMgr/u.erl b/src/hotUpdate/u1.erl similarity index 99% rename from src/srvNodeMgr/u.erl rename to src/hotUpdate/u1.erl index 647218d..ac00d7c 100644 --- a/src/srvNodeMgr/u.erl +++ b/src/hotUpdate/u1.erl @@ -14,7 +14,7 @@ %% @author rolong@vip.qq.com %%---------------------------------------------------- --module(u). +-module(u1). -compile(export_all). -include_lib("kernel/include/file.hrl"). diff --git a/src/srvNodeMgr/tools_cq/u.erl b/src/hotUpdate/u2.erl similarity index 99% rename from src/srvNodeMgr/tools_cq/u.erl rename to src/hotUpdate/u2.erl index 77447d5..7a44a83 100644 --- a/src/srvNodeMgr/tools_cq/u.erl +++ b/src/hotUpdate/u2.erl @@ -13,7 +13,7 @@ %% %%---------------------------------------------------- --module(u). +-module(u2). -include_lib("kernel/include/file.hrl"). -include("common.hrl"). diff --git a/src/testCase/utFunCallCase.erl b/src/testCase/utFunCallCase.erl index 655db6c..ad04246 100644 --- a/src/testCase/utFunCallCase.erl +++ b/src/testCase/utFunCallCase.erl @@ -75,15 +75,16 @@ tt5(N) -> tt5(0, CycleData, AA) -> ok; tt5(N, CycleData, AA) -> - tt5(N - 1, CycleData, AA). + NewCycleData = erlang:setelement(#cycleData.isHibernate, CycleData, true), + tt5(N - 1, NewCycleData, AA). tt6(N) -> - tt6(N, test, false, infinity, false, init_status, #{11 => 555, 44 => 434}, [1, 3, "dffd", "fdf"], #{etime => {aaa, fdfd}}, [123421, 434, 34]). + tt6(N, test, false, infinity, false, init_status, #{11 => 555, 44 => 434}, [1, 3, "dffd", "fdf"], #{etime => {aaa, fdfd}}, [123421, 434, 34], test, false, infinity, false, init_status, #{11 => 555, 44 => 434}, [1, 3, "dffd", "fdf"], #{etime => {aaa, fdfd}}, [123421, 434, 34]). -tt6(0, A1, B, C, D, E, F, G, H, AA) -> +tt6(0, A1, B, C, D, E, F, G, H, AA, A11, B1, C1, D1, E1, F1, G1, H1, AA1) -> ok; -tt6(N, A1, B, C, D, E, F, G, H, AA) -> - tt6(N - 1, A1, B, C, D, E, F, G, H, AA). +tt6(N, A1, B, C, D, E, F, G, H, AA, A11, B1, C1, D1, E1, F1, G1, H1, AA1) -> + tt6(N - 1, H1, true, D, E, F, G, A11, B1, C1, H, AA, D1, E1, F1, G1,A1, B, AA1). tt7(0) -> ok; diff --git a/src/testCase/utTestPerformance.erl b/src/testCase/utTestPerformance.erl index 4ecf5a4..9e866a1 100644 --- a/src/testCase/utTestPerformance.erl +++ b/src/testCase/utTestPerformance.erl @@ -476,6 +476,18 @@ lr(N) -> lists:reverse([]), lr(N - 1). +tsList(0, _, SceneId, LineId, ExtraArgs) -> + ok; +tsList(N, _, SceneId, LineId, ExtraArgs) -> + tsList(N - 1, [SceneId, LineId, ExtraArgs], SceneId, LineId, ExtraArgs). + +tsTuple(0, _, SceneId, LineId, ExtraArgs) -> + ok; +tsTuple(N, _, SceneId, LineId, ExtraArgs) -> + tsList(N - 1, {SceneId, LineId, ExtraArgs}, SceneId, LineId, ExtraArgs). + + + diff --git a/src/testCase/utTryCatchCase.erl b/src/testCase/utTryCatchCase.erl index a99694b..a54d170 100644 --- a/src/testCase/utTryCatchCase.erl +++ b/src/testCase/utTryCatchCase.erl @@ -195,6 +195,20 @@ do_exit() -> io:format("IMY**************************do_exit after ~n") end. +do_exit1() -> + try + io:format("IMY**************************do_exit try111~n"), + io:format("IMY**************************do_exit try222~n"), + io:format("IMY**************************do_exit try333~n"), + io:format("IMY**************************do_exit try444~n"), + erlang:raise(error, test, []), + io:format("IMY**************************do_exit try555~n") + catch + _A:_ -> + io:format("IMY**************************do_exit catch ~p ~p ~p ~n", [_A, 1, 1]) + after + io:format("IMY**************************do_exit after ~n") + end.