aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-09-10 16:45:57 +0200
committerErlang/OTP <[email protected]>2012-09-10 16:45:57 +0200
commit46a196336956de77d32ece5a9260023ac2a2ad9d (patch)
tree41e099ff8dfba4bb64212fed12ad4366e1393c30 /lib/common_test/src/ct.erl
parent952db27ba0a5b87a2a47f3a7034a9bf92e3651e5 (diff)
parentbc62025b2ffddc7957880c3f3251247d3901b315 (diff)
downloadotp-46a196336956de77d32ece5a9260023ac2a2ad9d.tar.gz
otp-46a196336956de77d32ece5a9260023ac2a2ad9d.tar.bz2
otp-46a196336956de77d32ece5a9260023ac2a2ad9d.zip
Merge branch 'peppe/common_test/shell_mode_broken' into maint-r15
* peppe/common_test/shell_mode_broken: Fix broken interactive mode
Diffstat (limited to 'lib/common_test/src/ct.erl')
-rw-r--r--lib/common_test/src/ct.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 49b51c9207..5014309c0f 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -274,7 +274,8 @@ step(TestDir,Suite,Case,Opts) ->
%%% <c>&gt; ct_telnet:cmd(unix_telnet, "ls .").</c><br/>
%%% <c>{ok,["ls","file1 ...",...]}</c></p>
start_interactive() ->
- ct_util:start(interactive).
+ ct_util:start(interactive),
+ ok.
%%%-----------------------------------------------------------------
%%% @spec stop_interactive() -> ok
@@ -282,7 +283,8 @@ start_interactive() ->
%%% @doc Exit the interactive mode.
%%% @see start_interactive/0
stop_interactive() ->
- ct_util:stop(normal).
+ ct_util:stop(normal),
+ ok.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% MISC INTERFACE