diff options
author | Peter Andersson <[email protected]> | 2016-12-02 09:08:11 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2016-12-02 09:08:11 +0100 |
commit | 27608cfe95d155e56b0cc7503bf910e9b23cd225 (patch) | |
tree | 05949b7ac5a27b7d4945a534e28ae140b12f1569 /lib/common_test/src/test_server_io.erl | |
parent | ca29c37928ad36cf4270fb3edffc2cf9752f2ed9 (diff) | |
parent | 39fef8eec26c2903ef11ba8829e1f625906b3e11 (diff) | |
download | otp-27608cfe95d155e56b0cc7503bf910e9b23cd225.tar.gz otp-27608cfe95d155e56b0cc7503bf910e9b23cd225.tar.bz2 otp-27608cfe95d155e56b0cc7503bf910e9b23cd225.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/test_server_io.erl')
-rw-r--r-- | lib/common_test/src/test_server_io.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/test_server_io.erl b/lib/common_test/src/test_server_io.erl index 3d5238052b..fdabf17b08 100644 --- a/lib/common_test/src/test_server_io.erl +++ b/lib/common_test/src/test_server_io.erl @@ -185,7 +185,7 @@ reset_state() -> init([]) -> process_flag(trap_exit, true), Empty = gb_trees:empty(), - {ok,Shared} = test_server_gl:start_link(), + {ok,Shared} = test_server_gl:start_link(self()), {ok,#st{fds=Empty,shared_gl=Shared,gls=gb_sets:empty(), io_buffering=gb_sets:empty(), buffered=Empty, @@ -200,7 +200,7 @@ req(Req) -> gen_server:call(?MODULE, Req, infinity). handle_call({get_gl,false}, _From, #st{gls=Gls,gl_props=Props}=St) -> - {ok,Pid} = test_server_gl:start_link(), + {ok,Pid} = test_server_gl:start_link(self()), test_server_gl:set_props(Pid, Props), {reply,Pid,St#st{gls=gb_sets:insert(Pid, Gls)}}; handle_call({get_gl,true}, _From, #st{shared_gl=Shared}=St) -> @@ -285,7 +285,7 @@ handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,gls=Gls, ok end, Empty = gb_trees:empty(), - {ok,Shared} = test_server_gl:start_link(), + {ok,Shared} = test_server_gl:start_link(self()), {reply,ok,#st{fds=Empty,shared_gl=Shared,gls=gb_sets:empty(), io_buffering=gb_sets:empty(), buffered=Empty, |