From 4bcb7bc41effe96ff13238891658f68a8874bb98 Mon Sep 17 00:00:00 2001
From: Zandra <zandra@erlang.org>
Date: Tue, 24 May 2016 08:51:37 +0200
Subject: vts - Fix unmatched_return warnings

---
 lib/common_test/src/vts.erl | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'lib/common_test')

diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index e1c16fbda4..f1c5051164 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -64,7 +64,7 @@
 %%%-----------------------------------------------------------------
 %%% User API
 start() ->
-    ct_webtool:start(),
+    {ok, _} = ct_webtool:start(),
     ct_webtool:start_tools([],"app=vts").
 
 init_data(ConfigFiles,EvHandlers,LogDir,LogOpts,Tests) ->
@@ -169,7 +169,7 @@ loop(State) ->
 	    NewState = State#state{config=Config,event_handler=EvHandlers,
 				   current_log_dir=LogDir,
 				   logopts=LogOpts,tests=Tests},
-	    ct_install(NewState),
+	    _ = ct_install(NewState),
 	    return(From,ok),
 	    loop(NewState);
 	{start_page,From} ->
@@ -192,12 +192,12 @@ loop(State) ->
 	    loop(State);
 	{{add_config_file,Input},From} ->
 	    {Return,State1} = add_config_file1(Input,State),
-	    ct_install(State1),
+	    _ = ct_install(State1),
 	    return(From,Return),
 	    loop(State1);
 	{{remove_config_file,Input},From} ->
 	    {Return,State1} = remove_config_file1(Input,State),
-	    ct_install(State1),
+	    _ = ct_install(State1),
 	    return(From,Return),
 	    loop(State1);
 	{run_frame,From} ->
@@ -233,7 +233,7 @@ loop(State) ->
 	    return(From,result_summary_frame1(State)),
 	    loop(State);
 	stop_reload_results ->
-	    file:set_cwd(State#state.start_dir),
+	    ok = file:set_cwd(State#state.start_dir),
 	    loop(State#state{reload_results=false});
 	{no_result_log_frame,From} ->
 	    return(From,no_result_log_frame1()),
@@ -277,8 +277,8 @@ call(Msg) ->
     end.
 
 return({To,Ref},Result) ->
-    To ! {Ref, Result}.
-
+    To ! {Ref, Result},
+    ok.
 
 run_test1(State=#state{tests=Tests,current_log_dir=LogDir,
 		       logopts=LogOpts}) ->
@@ -311,7 +311,6 @@ run_test1(State=#state{tests=Tests,current_log_dir=LogDir,
 ct_install(#state{config=Config,event_handler=EvHandlers,
 		  current_log_dir=LogDir}) ->
     ct_run:install([{config,Config},{event_handler,EvHandlers}],LogDir).
-    
 %%%-----------------------------------------------------------------
 %%% HTML
 start_page1() ->
@@ -549,7 +548,7 @@ case_select(Dir,Suite,Case,N) ->
 	end,
     case MakeResult of
 	ok ->
-	    code:add_pathz(Dir),
+	    true = code:add_pathz(Dir),
 	    case catch apply(Suite,all,[]) of
 		{'EXIT',Reason} ->
 		    io:format("\n~p\n",[Reason]),
@@ -755,7 +754,7 @@ report1(tests_start,{TestName,_N},State) ->
 	end,
     State#state{testruns=TestRuns};
 report1(tests_done,{_Ok,_Fail,_Skip},State) ->
-    timer:send_after(5000, self(),stop_reload_results),
+    {ok, _}  = timer:send_after(5000, self(),stop_reload_results),
     State#state{running=State#state.running-1,reload_results=true};
 report1(tc_start,{_Suite,_Case},State) ->
     State;
-- 
cgit v1.2.3