Merge branch 'zandra/test_server/unmatched_returns/OTP-13345'

* zandra/test_server/unmatched_returns/OTP-13345:
  vts - Fix unmatched_return warnings
  test_server_sup - Fix unmatched_return warnings
  test_server_node - Fix unmatched_return warnings
  test_server_io - Fix unmtached_return warnings
  test_server_gl - Fix unmatched_return warnings
  test_server_ctrl - Fix unmatched_return warnings
  test_server - fix unmatched_return warnings
  remove unused purify functions

9 files changed, 111 insertions, 157 deletions

diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index eaa4026a8a..4ebc1f5782 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -147,11 +147,7 @@ spawn_with_binaries(Config) when is_list(Config) ->
     TwoMeg = lists:duplicate(1024, L),
     Fun = fun() -> spawn(?MODULE, binary_owner, [list_to_binary(TwoMeg)]),
 			 receive after 1 -> ok end end,
-    Iter = case test_server:purify_is_running() of
-		     true -> 10;
-		     false -> 150
-		 end,
-    test_server:do_times(Iter, Fun),
+    test_server:do_times(150, Fun),
     ok.
 
 binary_owner(Bin) when is_binary(Bin) ->
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index 919526c5d7..bd677e971b 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -21,7 +21,7 @@
 -define(DEFAULT_TIMETRAP_SECS, 60).
 
 %%% TEST_SERVER_CTRL INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([run_test_case_apply/1,init_target_info/0,init_purify/0]).
+-export([run_test_case_apply/1,init_target_info/0]).
 -export([cover_compile/1,cover_analyse/2]).
 
 %%% TEST_SERVER_SUP INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -49,10 +49,6 @@
 
 -export([break/1,break/2,break/3,continue/0,continue/1]).
 
-%%% DEBUGGER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([purify_new_leaks/0, purify_format/2, purify_new_fds_inuse/0,
-	 purify_is_running/0]).
-
 %%% PRIVATE EXPORTED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([]).
 
@@ -73,10 +69,6 @@ init_target_info() ->
 		 username=test_server_sup:get_username(),
 		 cookie=atom_to_list(erlang:get_cookie())}.
 
-init_purify() ->
-    purify_new_leaks().
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% cover_compile(#cover{app=App,incl=Include,excl=Exclude,cross=Cross}) ->
 %%        {ok,#cover{mods=AnalyseModules}} | {error,Reason}
@@ -100,7 +92,7 @@ cover_compile(CoverInfo=#cover{app=none,incl=Include,cross=Cross}) ->
     case length(CompileMods) of
 	0 ->
 	    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
-	    cover:start(),			% start cover server anyway
+	    {ok, _} = start_cover(),			% start cover server anyway
 	    {ok,CoverInfo#cover{mods=[]}};
 	N ->
 	    io:fwrite("Cover compiling ~w modules - "
@@ -115,7 +107,7 @@ cover_compile(CoverInfo=#cover{app=App,excl=all,incl=Include,cross=Cross}) ->
     case length(CompileMods) of
 	0 ->
 	    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
-	    cover:start(),			% start cover server anyway
+	    {ok, _} = start_cover(),			% start cover server anyway
 	    {ok,CoverInfo#cover{mods=[]}};
 	N ->
 	    io:fwrite("Cover compiling '~w' (~w files) - "
@@ -158,7 +150,7 @@ cover_compile(CoverInfo=#cover{app=App,excl=Exclude,
 	    case length(CompileMods) of
 		0 ->
 		    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
-		    cover:start(),		% start cover server anyway
+		    {ok, _} = start_cover(),		% start cover server anyway
 		    {ok,CoverInfo#cover{mods=[]}};
 		N ->
 		    io:fwrite("Cover compiling '~w' (~w files) - "
@@ -175,11 +167,11 @@ module_names(Beams) ->
 
 
 do_cover_compile(Modules) ->
-    cover:start(),
+    {ok, _} = start_cover(),
     Sticky = prepare_cover_compile(Modules,[]),
     R = cover:compile_beam(Modules),
-    [warn_compile(Error) || Error <- R,element(1,Error)=/=ok],
-    [code:stick_mod(M) || M <- Sticky],
+    _ = [warn_compile(Error) || Error <- R,element(1,Error)=/=ok],
+    _ = [code:stick_mod(M) || M <- Sticky],
     ok.
 
 warn_compile({error,{Reason,Module}}) ->
@@ -366,9 +358,7 @@ stick_all_sticky(Node,Sticky) ->
 %% compensate timetraps for runtime delays introduced by e.g. tools like
 %% cover.
 
-run_test_case_apply({CaseNum,Mod,Func,Args,Name,
-		     RunInit,TimetrapData}) ->
-    purify_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
+run_test_case_apply({Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     case os:getenv("TS_RUN_VALGRIND") of
 	false ->
 	    ok;
@@ -380,7 +370,6 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,
     Result = run_test_case_apply(Mod, Func, Args, Name, RunInit,
 				 TimetrapData),
     ProcAft = erlang:system_info(process_count),
-    purify_new_leaks(),
     DetFail = get(test_server_detected_fail),
     {Result,DetFail,ProcBef,ProcAft}.
 
@@ -585,7 +574,8 @@ run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
 	{user_timetrap,Pid,_TrapTime,StartTime,E={user_timetrap_error,_},_} ->
 	    case update_user_timetraps(Pid, StartTime) of
 		proceed ->
-		    self() ! {abort_current_testcase,E,Pid};
+		    self() ! {abort_current_testcase,E,Pid},
+		    ok;
 		ignore ->
 		    ok
 	    end,
@@ -600,7 +590,8 @@ run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
 				   true -> 
 					TrapTime
 				end,
-		    timetrap(TrapTime, TotalTime, Pid, Scale);
+		    _ = timetrap(TrapTime, TotalTime, Pid, Scale),
+		    ok;
 		ignore ->
 		    ok
 	    end,
@@ -724,7 +715,7 @@ do_call_end_conf(Starter,Mod,Func,Data,TCExitReason,Conf,TVal) ->
 		Supervisor = self(),
 		EndConfApply =
 		    fun() ->
-			    timetrap(TVal),
+			    _ = timetrap(TVal),
 			    %% We can't handle fails or skips here
 			    %% (neither input nor output). The error can
 			    %% be read from Conf though (tc_status).
@@ -775,7 +766,8 @@ print_end_conf_result(Mod,Func,Conf,Cause,Error) ->
 			      " ~s!\n\tReason: ~ts\n",
 			      [Mod,Func,Conf,Cause,ErrorStr])
 	end,
-    group_leader() ! {printout,12,Str2Print}.
+    group_leader() ! {printout,12,Str2Print},
+    ok.
 
 
 spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid,
@@ -1287,7 +1279,9 @@ user_callback({CBMod,CBFunc}, Mod, Func, InitOrEnd, Args) ->
 
 init_per_testcase(Mod, Func, Args) ->
     case code:is_loaded(Mod) of
-	false -> code:load_file(Mod);
+	false ->
+	    _ = code:load_file(Mod),
+	    ok;
 	_ -> ok
     end,
     case erlang:function_exported(Mod, init_per_testcase, 2) of
@@ -1355,7 +1349,8 @@ print_init_conf_result(Line,Cause,Reason) ->
 			      "\tLocation: ~ts\n\tReason: ~ts\n",
 			      [Cause,FormattedLoc,ReasonStr])
 	end,
-    group_leader() ! {printout,12,Str2Print}.
+    group_leader() ! {printout,12,Str2Print},
+    ok.
 
 
 end_per_testcase(Mod, Func, Conf) ->
@@ -1426,7 +1421,8 @@ print_end_tc_warning(EndFunc,Reason,Cause,Loc) ->
 			      "Reason: ~ts\nLine: ~ts\n",
 			      [EndFunc,Cause,ReasonStr,FormattedLoc])
 	end,
-    group_leader() ! {printout,12,Str2Print}.
+    group_leader() ! {printout,12,Str2Print},
+    ok.
 
 get_loc() ->
     get(test_server_loc).
@@ -1829,7 +1825,6 @@ timetrap_scale_factor() ->
     timetrap_scale_factor([
 	{ 2, fun() -> has_lock_checking() end},
 	{ 3, fun() -> has_superfluous_schedulers() end},
-	{ 5, fun() -> purify_is_running() end},
 	{ 6, fun() -> is_debug() end},
 	{10, fun() -> is_cover() end}
     ]).
@@ -2129,7 +2124,8 @@ timetrap_cancel_all(TCPid, SendToServer) ->
 	    ok;
 	Timers ->
 	    [timetrap_cancel_one(Handle, false) ||
-		{Handle,Pid,_} <- Timers, Pid == TCPid]
+		{Handle,Pid,_} <- Timers, Pid == TCPid],
+	    ok
     end,
     case get(test_server_user_timetrap) of
 	undefined ->
@@ -2139,13 +2135,15 @@ timetrap_cancel_all(TCPid, SendToServer) ->
 		{UserTTSup,_StartTime} ->
 		    remove_user_timetrap(UserTTSup),
 		    put(test_server_user_timetrap,
-			proplists:delete(TCPid, UserTTs));
+			proplists:delete(TCPid, UserTTs)),
+			ok;
 		undefined ->
 		    ok
 	    end
     end,
     if SendToServer == true ->
-	    group_leader() ! {timetrap_cancel_all,TCPid,self()};
+	    group_leader() ! {timetrap_cancel_all,TCPid,self()},
+	    ok;
        true ->
 	    ok
     end,
@@ -2560,10 +2558,11 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 -spec start_job_proxy_fun(_, _) -> fun(() -> no_return()).
 start_job_proxy_fun(Master, Fun) ->
     fun () ->
-            start_job_proxy(),
+            _ = start_job_proxy(),
             receive
                 Ref ->
-                    Master ! {Ref, Fun()}
+                    Master ! {Ref, Fun()},
+                    ok
             end,
             receive after infinity -> infinity end
     end.
@@ -2729,64 +2728,25 @@ is_commercial() ->
 	_ -> true
     end.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                     DEBUGGER INTERFACE                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% purify_is_running() -> false|true
-%%
-%% Tests if Purify is currently running.
-
-purify_is_running() ->
-    case catch erlang:system_info({error_checker, running}) of
-	{'EXIT', _} -> false;
-	Res -> Res
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% purify_new_leaks() -> false|BytesLeaked
-%% BytesLeaked = integer()
-%%
-%% Checks for new memory leaks if Purify is active.
-%% Returns the number of bytes leaked, or false if Purify
-%% is not running.
-purify_new_leaks() ->
-    case catch erlang:system_info({error_checker, memory}) of
-	{'EXIT', _} -> false;
-	Leaked when is_integer(Leaked) -> Leaked
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% purify_new_fds_inuse() -> false|FdsInuse
-%% FdsInuse = integer()
-%%
-%% Checks for new file descriptors in use.
-%% Returns the number of new file descriptors in use, or false
-%% if Purify is not running.
-purify_new_fds_inuse() ->
-    case catch erlang:system_info({error_checker, fd}) of
-	{'EXIT', _} -> false;
-	Inuse when is_integer(Inuse) -> Inuse
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% purify_format(Format, Args) -> ok
-%% Format = string()
-%% Args = lists()
-%%
-%% Outputs the formatted string to Purify's logfile,if Purify is active.
-purify_format(Format, Args) ->
-    (catch erlang:system_info({error_checker, io_lib:format(Format, Args)})),
-    ok.
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Apply given function and reply to caller or proxy.
 %%
 do_sync_apply(Proxy, From, {M,F,A}) ->
     Result = apply(M, F, A),
-    if is_pid(Proxy) -> Proxy ! {sync_result_proxy,From,Result};
-       true -> From ! {sync_result,Result}
+    if  is_pid(Proxy) ->
+	    Proxy ! {sync_result_proxy,From,Result},
+	    ok;
+	true ->
+	    From ! {sync_result,Result},
+	    ok
     end.
+
+start_cover() ->
+    case cover:start() of
+       {error, {already_started, Pid}} ->
+           {ok, Pid};
+       Else ->
+           Else
+   end.
+
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index ff960c22a5..84e35e7371 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -512,7 +512,7 @@ init([]) ->
     TI = TI0#target_info{host=TargetHost,
 			 naming=naming(),
 			 master=TargetHost},
-    ets:new(slave_tab, [named_table,set,public,{keypos,2}]),
+    _ = ets:new(slave_tab, [named_table,set,public,{keypos,2}]),
     set_hosts([TI#target_info.host]),
     {ok,State#state{target_info=TI}}.
 
@@ -867,7 +867,7 @@ handle_call({create_priv_dir,Value}, _From, State) ->
 handle_call({testcase_callback,ModFunc}, _From, State) ->
     case ModFunc of
 	{Mod,Func} ->
-	    case code:is_loaded(Mod) of
+	    _ = case code:is_loaded(Mod) of
 		{file,_} ->
 		    ok;
 		false ->
@@ -1079,8 +1079,8 @@ terminate(_Reason, State) ->
 	false -> ok;
 	Sock -> test_server_node:stop_tracer_node(Sock)
     end,
-    kill_all_jobs(State#state.jobs),
-    test_server_node:kill_nodes(),
+    ok = kill_all_jobs(State#state.jobs),
+    _ = test_server_node:kill_nodes(),
     ok.
 
 kill_all_jobs([{_Name,JobPid}|Jobs]) ->
@@ -1125,7 +1125,7 @@ spawn_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
 init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	    RejectIoReqs, CreatePrivDir, TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
-    test_server_io:start_link(),
+    _ = test_server_io:start_link(),
     put(test_server_name, Name),
     put(test_server_dir, Dir),
     put(test_server_total_time, 0),
@@ -1199,8 +1199,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
     {UnexpectedIoName,UnexpectedIoFooter} = get(test_server_unexpected_footer),
     {ok,UnexpectedIoFd} = open_html_file(UnexpectedIoName, [append]),
     io:put_chars(UnexpectedIoFd, "\n</pre>\n"++UnexpectedIoFooter),
-    file:close(UnexpectedIoFd),
-    ok.
+    ok = file:close(UnexpectedIoFd).
 
 report_severe_error(Reason) ->
     test_server_sup:framework_call(report, [severe_error,Reason]).
@@ -1927,7 +1926,7 @@ html_convert_modules([Mod|Mods]) ->
 		    Name = atom_to_list(Mod),
 		    DestFile = filename:join(DestDir,
 					     downcase(Name)++?src_listing_ext),
-		    html_possibly_convert(SrcFile1, SrcFileInfo, DestFile),
+		    _ = html_possibly_convert(SrcFile1, SrcFileInfo, DestFile),
 		    html_convert_modules(Mods)
 	    end;
 	_Other ->
@@ -2066,7 +2065,7 @@ add_init_and_end_per_suite([], LastMod, LastRef, FwMod) ->
     end.    
 
 do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
-    case code:is_loaded(Mod) of
+    _ = case code:is_loaded(Mod) of
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
@@ -2140,7 +2139,6 @@ do_add_end_per_suite_and_skip(LastMod, LastRef, Mod, FwMod) ->
 %% Runs the specified tests, then displays/logs the summary.
 
 run_test_cases(TestSpec, Config, TimetrapData) ->
-    test_server:init_purify(),
     case lists:member(no_src, get(test_server_logopts)) of
 	true ->
 	    ok;
@@ -2323,7 +2321,7 @@ run_test_cases_loop([{SkipTag,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    Config, TimetrapData, Mode, Status) when
       ((SkipTag==auto_skip_case) or (SkipTag==skip_case)) and
       ((Type==conf) or (Type==make)) ->
-    file:set_cwd(filename:dirname(get(test_server_dir))),
+    ok = file:set_cwd(filename:dirname(get(test_server_dir))),
     CurrIOHandler = get(test_server_common_io_handler),
     ParentMode = tl(Mode),
 
@@ -2339,7 +2337,7 @@ run_test_cases_loop([{SkipTag,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		false ->
 		    %% this is a skipped end conf for a top level parallel
 		    %% group, buffered io can be flushed
-		    handle_test_case_io_and_status(),
+		    _ = handle_test_case_io_and_status(),
 		    set_io_buffering(undefined),
 		    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
 					   false, SkipMode),
@@ -2351,7 +2349,7 @@ run_test_cases_loop([{SkipTag,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		_ ->
 		    %% this is a skipped end conf for a parallel group nested
 		    %% under a parallel group (io buffering is active)
-		    wait_for_cases(Ref),
+		    _ = wait_for_cases(Ref),
 		    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
 					   true, SkipMode),
 		    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
@@ -2459,7 +2457,7 @@ run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
 
 run_test_cases_loop([{skip_case,{{Mod,all}=Case,Comment},SkipMode}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
-    skip_case(user, undefined, 0, Case, Comment, false, SkipMode),
+    _ = skip_case(user, undefined, 0, Case, Comment, false, SkipMode),
     test_server_sup:framework_call(report, [tc_user_skip,
 					    {Mod,{all,get_name(SkipMode)},
 					     Comment}]),
@@ -2489,7 +2487,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			%% collect results from the test case processes
 			%% and calc total time
 			OkSkipFail = handle_test_case_io_and_status(),
-			file:set_cwd(filename:dirname(get(test_server_dir))),
+			ok = file:set_cwd(filename:dirname(get(test_server_dir))),
 			After = ?now,
 			Before = get(test_server_parallel_start_time),
 			Elapsed = timer:now_diff(After, Before)/1000000,
@@ -3582,7 +3580,7 @@ handle_io_and_exit_loop([], [{undefined,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, O
 handle_io_and_exit_loop(Refs, [{Ref,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
     receive
 	{started,_,CurrPid,CaseNum,Mod,Func} ->
-	    handle_io_and_exits(self(), CurrPid, CaseNum, Mod, Func, Cases),
+	    _ = handle_io_and_exits(self(), CurrPid, CaseNum, Mod, Func, Cases),
 	    Refs1 =
 		case Refs of
 		    [Ref|Rs] ->	                % must be end conf case for subgroup
@@ -3658,7 +3656,7 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 %% about the execution time and the return value of the test case function.
 
 run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData) ->
-    file:set_cwd(filename:dirname(get(test_server_dir))),
+    ok = file:set_cwd(filename:dirname(get(test_server_dir))),
     run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 		   TimetrapData, [], self()).
 
@@ -3668,7 +3666,7 @@ run_test_case(Ref, Num, Mod, Func, Args, skip_init, TimetrapData, Mode) ->
 		   TimetrapData, Mode, self());
 
 run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData, Mode) ->
-    file:set_cwd(filename:dirname(get(test_server_dir))),
+    ok = file:set_cwd(filename:dirname(get(test_server_dir))),
     Main = self(),
     case check_prop(parallel, Mode) of
 	false ->
@@ -3682,7 +3680,7 @@ run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData, Mode) ->
 	    spawn_link(
 	      fun() ->
 		      process_flag(trap_exit, true),
-		      [put(Key, Val) || {Key,Val} <- Dictionary],
+		      _ = [put(Key, Val) || {Key,Val} <- Dictionary],
 		      set_io_buffering({tc,Main}),
 		      run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 				     TimetrapData, Mode, Main)
@@ -3699,7 +3697,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	false -> ok;
 	true ->
 	    test_server_io:start_transaction(),
-	    Main ! {started,Ref,self(),Num,Mod,Func}
+	    Main ! {started,Ref,self(),Num,Mod,Func},
+	    ok
     end,
     TSDir = get(test_server_dir),
 
@@ -3774,7 +3773,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 
     %% run the test case
     {Result,DetectedFail,ProcsBefore,ProcsAfter} =
-	run_test_case_apply(Num, Mod, Func, [UpdatedArgs], GrName,
+	run_test_case_apply(Mod, Func, [UpdatedArgs], GrName,
 			    RunInit, TimetrapData),
     {Time,RetVal,Loc,Opts,Comment} =
 	case Result of
@@ -3906,7 +3905,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	true ->
 	    test_server_io:end_transaction(),
 	    Main ! {finished,Ref,self(),Num,Mod,Func,
-		    ?mod_result(Status),{Time,RetVal,Opts}}
+		    ?mod_result(Status),{Time,RetVal,Opts}},
+		    ok
     end,
     {Time,RetVal,Opts}.
 
@@ -4329,7 +4329,7 @@ do_format_exception(Reason={Error,Stack}) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
+%% run_test_case_apply(Mod, Func, Args, Name, RunInit,
 %%                     TimetrapData) ->
 %%  {{Time,RetVal,Loc,Opts,Comment},DetectedFail,ProcessesBefore,ProcessesAfter} |
 %%  {{died,Reason,unknown,Comment},DetectedFail,ProcessesBefore,ProcessesAfter}
@@ -4343,9 +4343,9 @@ do_format_exception(Reason={Error,Stack}) ->
 %% ProcessesBefore = ProcessesAfter = integer()
 %%
 
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
+run_test_case_apply(Mod, Func, Args, Name, RunInit,
 		    TimetrapData) ->
-    test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
+    test_server:run_test_case_apply({Mod,Func,Args,Name,RunInit,
 				     TimetrapData}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5276,7 +5276,8 @@ check_cross([]) ->
 %% This per application analysis writes the file cover.html in the
 %% application's run.<timestamp> directory.
 stop_cover(#cover{}=CoverInfo, TestDir) ->
-    cover_analyse(CoverInfo, TestDir);
+    cover_analyse(CoverInfo, TestDir),
+    ok;
 stop_cover(_CoverInfo, _TestDir) ->
     %% Cover is probably controlled by the framework
     ok.
@@ -5315,7 +5316,7 @@ cover_analyse(CoverInfo, TestDir) ->
 	      [?cross_coverlog_name]),
 
     io:fwrite(CoverLog, "<p>CoverFile: <code>~tp</code>\n", [CoverFile]),
-    write_cross_cover_info(TestDir,Cross),
+    ok = write_cross_cover_info(TestDir,Cross),
 
     case length(cover:imported_modules()) of
 	Imps when Imps > 0 ->
@@ -5329,7 +5330,7 @@ cover_analyse(CoverInfo, TestDir) ->
     io:fwrite(CoverLog, "<p>Excluded module(s): <code>~tp</code>\n", [Excluded]),
 
     Coverage = test_server:cover_analyse(TestDir, CoverInfo),
-    write_binary_file(filename:join(TestDir,?raw_coverlog_name),
+    ok = write_binary_file(filename:join(TestDir,?raw_coverlog_name),
 		      term_to_binary(Coverage)),
 
     case lists:filter(fun({_M,{_,_,_}}) -> false;
@@ -5344,8 +5345,8 @@ cover_analyse(CoverInfo, TestDir) ->
     end,
 
     TotPercent = write_cover_result_table(CoverLog, Coverage),
-    write_binary_file(filename:join(TestDir, ?cover_total),
-		      term_to_binary(TotPercent)).
+    ok = write_binary_file(filename:join(TestDir, ?cover_total),
+			   term_to_binary(TotPercent)).
 
 %% Cover analysis - accumulated over multiple tests
 %% This can be executed on any node after all tests are finished.
@@ -5395,7 +5396,7 @@ write_cross_cover_info(Dir,Cross) ->
 write_cross_cover_logs([{Tag,Coverage}|T],TagDirMods) ->
     case lists:keyfind(Tag,1,TagDirMods) of
 	{_,Dir,Mods} when Mods=/=[] ->
-	    write_binary_file(filename:join(Dir,?raw_cross_coverlog_name),
+	    ok = write_binary_file(filename:join(Dir,?raw_cross_coverlog_name),
 			      term_to_binary(Coverage)),
 	    CoverLogName = filename:join(Dir,?cross_coverlog_name),
 	    {ok,CoverLog} = open_html_file(CoverLogName),
diff --git a/lib/common_test/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl
index 333c8fc06e..7d6fe64b92 100644
--- a/lib/common_test/src/test_server_gl.erl
+++ b/lib/common_test/src/test_server_gl.erl
@@ -185,7 +185,7 @@ handle_info({capture,Cap0}, St) ->
 	  end,
     {noreply,St#st{capture=Cap}};
 handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
-    try	io_req(Req, From, St) of
+    _ = try io_req(Req, From, St) of
 	passthrough ->
 	    group_leader() ! IoReq;
 	{EscapeHtml,Data} ->
@@ -197,7 +197,8 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
 			#st{capture=none} ->
 			    ok;
 			#st{capture=CapturePid} ->
-			    CapturePid ! {captured,Data}
+			    CapturePid ! {captured,Data},
+			    ok
 		    end,
 		    case EscapeHtml andalso St#st.escape_chars of
 			true ->
diff --git a/lib/common_test/src/test_server_io.erl b/lib/common_test/src/test_server_io.erl
index 8c5c0aef35..3d5238052b 100644
--- a/lib/common_test/src/test_server_io.erl
+++ b/lib/common_test/src/test_server_io.erl
@@ -215,7 +215,7 @@ handle_call({set_fd,Tag,Fd}, _From, #st{fds=Fds0,tags=Tags0,
 	   true ->
 		%% Fd ready, print anything buffered for associated Tag
 		lists:filtermap(fun({T,From,Str}) when T == Tag ->
-					output(From, Tag, Str, St1),
+					_ = output(From, Tag, Str, St1),
 					false;
 				   (_) ->
 					true
@@ -274,14 +274,15 @@ handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,gls=Gls,
 			  end
 		  end, Tags),
     GlList = gb_sets:to_list(Gls),
-    [test_server_gl:stop(GL) || GL <- GlList],
+    _ = [test_server_gl:stop(GL) || GL <- GlList],
     timer:sleep(100),
     case lists:filter(fun(GlPid) -> is_process_alive(GlPid) end, GlList) of
 	[] ->
 	    ok;
 	_ ->
 	    timer:sleep(2000),
-	    [exit(GL, kill) || GL <- GlList]
+	    [exit(GL, kill) || GL <- GlList],
+	    ok
     end,
     Empty = gb_trees:empty(),
     {ok,Shared} = test_server_gl:start_link(),
@@ -304,7 +305,7 @@ handle_call({stop,FdTags}, From, #st{fds=Fds0,tags=Tags0,
 				   none ->
 				       {Fds,Tags};
 				   {value,Fd} ->
-				       file:close(Fd),
+				       _ = file:close(Fd),
 				       {gb_trees:delete(Tag, Fds),
 					lists:delete(Tag, Tags)}
 			       end
@@ -333,7 +334,7 @@ handle_info({'EXIT',_Pid,Reason}, _St) ->
 handle_info(stop_group_leaders, #st{gls=Gls}=St) ->
     %% Stop the remaining group leaders.
     GlPids = gb_sets:to_list(Gls),
-    [test_server_gl:stop(GL) || GL <- GlPids],
+    _ = [test_server_gl:stop(GL) || GL <- GlPids],
     timer:sleep(100),
     Wait = 
 	case lists:filter(fun(GlPid) -> is_process_alive(GlPid) end, GlPids) of
@@ -344,7 +345,7 @@ handle_info(stop_group_leaders, #st{gls=Gls}=St) ->
     {noreply,St};
 handle_info(kill_group_leaders, #st{gls=Gls,stopping=From,
 				    pending_ops=Ops}=St) ->
-    [exit(GL, kill) || GL <- gb_sets:to_list(Gls)],
+    _ = [exit(GL, kill) || GL <- gb_sets:to_list(Gls)],
     if From /= undefined ->
 	    gen_server:reply(From, ok);
        true ->					% reply has been sent already
@@ -434,7 +435,7 @@ do_print_buffered(Q0, St) ->
 	eot ->
 	    Q;
 	{Tag,Str} ->
-	    do_output(Tag, Str, undefined, St),
+	    _ = do_output(Tag, Str, undefined, St),
 	    do_print_buffered(Q, St)
     end.
 
@@ -448,5 +449,5 @@ gc(#st{gls=Gls0}) ->
     InUse = ordsets:from_list(InUse0),
     Gls = gb_sets:to_list(Gls0),
     NotUsed = ordsets:subtract(Gls, InUse),
-    [test_server_gl:stop(Pid) || Pid <- NotUsed],
+    _ = [test_server_gl:stop(Pid) || Pid <- NotUsed],
     ok.
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index c64399e485..0b406c54cc 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -198,9 +198,9 @@ trc_loop(Sock,Patterns,Type) ->
 	    gen_tcp:close(Sock)
     end.
 add_nodes(Nodes,Patterns,_Type) ->
-    ttb:tracer(Nodes,[{file,{local, test_server}},
-		      {handler, {{?MODULE,handle_debug},initial}}]),
-    ttb:p(all,[call,timestamp]),
+    {ok, _} = ttb:tracer(Nodes,[{file,{local, test_server}},
+			        {handler, {{?MODULE,handle_debug},initial}}]),
+    {ok, _} = ttb:p(all,[call,timestamp]),
     lists:foreach(fun({TP,M,F,A,Pat}) -> ttb:TP(M,F,A,Pat);
 		     ({CTP,M,F,A}) -> ttb:CTP(M,F,A) 
 		  end,
@@ -360,8 +360,8 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 -spec wait_for_node_started_fun(_, _, _, _, _) -> fun(() -> no_return()).
 wait_for_node_started_fun(LSock, Tmo, Cleanup, TI, Self) ->
     fun() ->
-            wait_for_node_started(LSock,Tmo,undefined,
-                                  Cleanup,TI,Self),
+            {{ok, _}, _} = wait_for_node_started(LSock,Tmo,undefined,
+                                                 Cleanup,TI,Self),
             receive after infinity -> ok end
     end.
 
@@ -432,7 +432,7 @@ wait_for_node_started(LSock,Timeout,Client,Cleanup,TI,CtrlPid) ->
 								     client=Client});
 				false -> ok
 			    end,
-			    gen_tcp:controlling_process(Sock,CtrlPid),
+			    ok = gen_tcp:controlling_process(Sock,CtrlPid),
 			    test_server_ctrl:node_started(Nodename),
 			    {{ok,Nodename},W}
 		    end;
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index fa2bb33c2d..6922e01fcc 100644
--- a/lib/common_test/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -755,7 +755,7 @@ framework_call(FW,_Func,_Args,DefaultReturn)
     DefaultReturn;
 framework_call(Callback,Func,Args,DefaultReturn) ->
     Mod = list_to_atom(Callback),
-    case code:is_loaded(Mod) of
+    _ = case code:is_loaded(Mod) of
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
@@ -851,7 +851,8 @@ util_start() ->
 	    spawn_link(fun() ->
 			       register(?MODULE, self()),
 			       util_loop(#util_state{starter=Starter})
-		       end);
+		       end),
+	    ok;
 	_Pid ->
 	    ok
     end.
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;
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 54f452825f..3d4ae1a189 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -61,13 +61,8 @@ id_transform(Config) when is_list(Config) ->
 			"erl_id_trans.erl"]),
     {ok,erl_id_trans,Bin} = compile:file(File,[binary]),
     {module,erl_id_trans} = code:load_binary(erl_id_trans, File, Bin),
-    case test_server:purify_is_running() of
-	false ->
-	    ct:timetrap({hours,1}),
-	    run_in_test_suite();
-	true ->
-	    {skip,"Valgrind (too slow)"}
-    end.
+    ct:timetrap({hours,1}),
+    run_in_test_suite().
 
 run_in_test_suite() ->
     SuperDir = filename:dirname(filename:dirname(code:which(?MODULE))),