浏览代码

修改

master
AICells 4 年前
父节点
当前提交
61e0ce93f5
共有 10 个文件被更改,包括 35 次插入8 次删除
  1. +0
    -0
      src/dynamicCompile/mmake.erl
  2. +0
    -0
      src/hotUpdate/h.erl
  3. +0
    -0
      src/hotUpdate/reloader.erl
  4. +1
    -1
      src/hotUpdate/reloader1.erl
  5. +0
    -0
      src/hotUpdate/u.erl
  6. +1
    -1
      src/hotUpdate/u1.erl
  7. +1
    -1
      src/hotUpdate/u2.erl
  8. +6
    -5
      src/testCase/utFunCallCase.erl
  9. +12
    -0
      src/testCase/utTestPerformance.erl
  10. +14
    -0
      src/testCase/utTryCatchCase.erl

src/srvNodeMgr/tools_cq/mmake.erl → src/dynamicCompile/mmake.erl 查看文件


src/srvNodeMgr/tools_cq/h.erl → src/hotUpdate/h.erl 查看文件


src/dynamicCompile/reloader.erl → src/hotUpdate/reloader.erl 查看文件


src/srvNodeMgr/reloader.erl → 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 <matthew@mochimedia.com>").
-include_lib("kernel/include/file.hrl").

src/srvNodeMgr/tools/gameWorld/test/tools/u.erl → src/hotUpdate/u.erl 查看文件


src/srvNodeMgr/u.erl → 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").

src/srvNodeMgr/tools_cq/u.erl → src/hotUpdate/u2.erl 查看文件

@ -13,7 +13,7 @@
%%
%%----------------------------------------------------
-module(u).
-module(u2).
-include_lib("kernel/include/file.hrl").
-include("common.hrl").

+ 6
- 5
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;

+ 12
- 0
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).

+ 14
- 0
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.

正在加载...
取消
保存