[ct] Cleanup and rename purify related functions as valgrind

2 files changed, 21 insertions, 49 deletions

diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index a47b3f824f..dc6b7a536c 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,init_valgrind/0]).
 -export([cover_compile/1,cover_analyse/2]).
 
 %%% TEST_SERVER_SUP INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -50,8 +50,8 @@
 -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]).
+-export([valgrind_new_leaks/0, valgrind_format/2,
+	 is_valgrind/0]).
 
 %%% PRIVATE EXPORTED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([]).
@@ -73,8 +73,8 @@ init_target_info() ->
 		 username=test_server_sup:get_username(),
 		 cookie=atom_to_list(erlang:get_cookie())}.
 
-init_purify() ->
-    purify_new_leaks().
+init_valgrind() ->
+    valgrind_new_leaks().
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -367,11 +367,11 @@ stick_all_sticky(Node,Sticky) ->
 %% cover.
 
 run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
-    purify_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
     case is_valgrind() of
 	false ->
 	    ok;
 	true ->
+            valgrind_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
 	    os:putenv("VALGRIND_LOGFILE_INFIX",atom_to_list(Mod)++"."++
 		      atom_to_list(Func)++"-")
     end,
@@ -379,7 +379,7 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     Result = run_test_case_apply(Mod, Func, Args, Name, RunInit,
 				 TimetrapData),
     ProcAft = erlang:system_info(process_count),
-    purify_new_leaks(),
+    valgrind_new_leaks(),
     DetFail = get(test_server_detected_fail),
     {Result,DetFail,ProcBef,ProcAft}.
 
@@ -1836,7 +1836,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},
         {10, fun() -> is_valgrind() end}
@@ -2746,59 +2745,32 @@ is_commercial() ->
 %%
 %% Returns true if valgrind is running, else false
 is_valgrind() ->
-    case os:getenv("TS_RUN_VALGRIND") of
-	false -> false;
-	_ -> true
+    case catch erlang:system_info({valgrind, running}) of
+	{'EXIT', _} -> false;
+	Res -> Res
     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.
+%% valgrind_new_leaks() -> ok
+%%
+%% Checks for new memory leaks if Valgrind is active.
+valgrind_new_leaks() ->
+    catch erlang:system_info({valgrind, memory}),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% purify_format(Format, Args) -> ok
+%% valgrind_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)})),
+%% Outputs the formatted string to Valgrind's logfile,if Valgrind is active.
+valgrind_format(Format, Args) ->
+    (catch erlang:system_info({valgrind, io_lib:format(Format, Args)})),
     ok.
 
 
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 48fe90a4d5..71978c7267 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -2163,7 +2163,7 @@ 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(),
+    test_server:init_valgrind(),
     case lists:member(no_src, get(test_server_logopts)) of
 	true ->
 	    ok;