Eliminate use of ?config() macro

9 files changed, 76 insertions, 76 deletions

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 4628e5f1b1..0a65c3ecee 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -79,7 +79,7 @@ coverage(Config) when is_list(Config) ->
     ?MODULE:do_coverage(Config).
 
 do_coverage(Config) ->
-    Outdir = ?config(priv_dir, Config),
+    Outdir = proplists:get_value(priv_dir, Config),
     ExportFile = filename:join(Outdir, "export"),
     ok = cover:export(ExportFile, ?MODULE),
     {error,{already_started,_}} = cover:start(),
@@ -112,7 +112,7 @@ coverage_analysis(Config) when is_list(Config) ->
     io:format("~p\n", [Analysis2]),
     {ok,_Analysis3} = cover:analyze(?MODULE, calls, line),
 
-    Outdir = ?config(priv_dir, Config),
+    Outdir = proplists:get_value(priv_dir, Config),
     Outfile = filename:join(Outdir, ?MODULE),
 
     {ok,Outfile} = cover:analyze_to_file(?MODULE, Outfile),
@@ -124,7 +124,7 @@ coverage_analysis(Config) when is_list(Config) ->
 
 start(suite) -> [];
 start(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     Files = lsfiles(),
     remove(files(Files, ".out")),
@@ -134,7 +134,7 @@ start(Config) when is_list(Config) ->
 
 compile(suite) -> [];
 compile(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     Result1 = cover:compile_directory(),
     SortedResult = lists:sort(Result1),
@@ -180,7 +180,7 @@ compile(Config) when is_list(Config) ->
             ok = beam_lib:crypto_key_fun(simple_crypto_fun(Key)),
             {ok,crypt} = cover:compile_beam("crypt.beam")
     end,
-    Path = filename:join([?config(data_dir, Config), "compile_beam", "v.erl"]),
+    Path = filename:join([proplists:get_value(data_dir, Config), "compile_beam", "v.erl"]),
     {ok,v} = cover:compile_beam(v),
     {source,Path} = lists:keyfind(source, 1, v:module_info(compile)),
     {ok,w} = cover:compile_beam("w.beam"),
@@ -217,7 +217,7 @@ simple_crypto_fun(Key) ->
 
 analyse(suite) -> [];
 analyse(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     done = a:start(5),
 
@@ -404,7 +404,7 @@ analyse(Config) when is_list(Config) ->
 
 misc(suite) -> [];
 misc(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     [a,cc,crypt,d,e,f,v] = lists:sort(cover:modules()),
 
@@ -423,7 +423,7 @@ misc(Config) when is_list(Config) ->
 
 stop(suite) -> [];
 stop(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     cover_compiled = code:which(a),
     {ok,d} = compile:file(d, [{d,'AGE',42}]),
@@ -440,7 +440,7 @@ stop(Config) when is_list(Config) ->
 
 distribution(suite) -> [];
 distribution(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
     {ok,N1} = ?t:start_node(cover_SUITE_distribution1,slave,[]),
@@ -543,7 +543,7 @@ distribution(Config) when is_list(Config) ->
 
 %% Test that a lost node is reconnected
 reconnect(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
     {ok,a} = compile:file(a),
@@ -597,7 +597,7 @@ reconnect(Config) ->
 
 %% Test that a lost node is reconnected - also if it has been dead
 die_and_reconnect(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
     {ok,f} = compile:file(f),
@@ -640,7 +640,7 @@ die_and_reconnect(Config) ->
 %% Test that a stopped node is not marked as lost, i.e. that it is not
 %% reconnected if it is restarted (OTP-10638)
 dont_reconnect_after_stop(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
     {ok,f} = compile:file(f),
@@ -683,7 +683,7 @@ dont_reconnect_after_stop(Config) ->
 %% Test that a node which is stopped while it is marked as lost is not
 %% reconnected if it is restarted (OTP-10638)
 stop_node_after_disconnect(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
     {ok,f} = compile:file(f),
@@ -726,7 +726,7 @@ stop_node_after_disconnect(Config) ->
     ok.
 
 distribution_performance(Config) ->
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     Dir = filename:join(PrivDir,"distribution_performance"),
     AllFiles = filename:join(Dir,"*"),
     ok = filelib:ensure_dir(AllFiles),
@@ -840,7 +840,7 @@ generate_clauses(C,Func) ->
 
 export_import(suite) -> [];
 export_import(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
     PortCount = length(erlang:ports()),
 
@@ -956,7 +956,7 @@ eif(doc) ->
 eif(suite) ->
     [];
 eif(Config) when is_list(Config) ->
-    ok = file:set_cwd(filename:join(?config(data_dir, Config),
+    ok = file:set_cwd(filename:join(proplists:get_value(data_dir, Config),
                                     "included_functions")),
     {ok, cover_inc} = compile:file(cover_inc,[debug_info]),
     {ok, cover_inc} = cover:compile_beam(cover_inc),
@@ -970,7 +970,7 @@ eif(Config) when is_list(Config) ->
 
 otp_5305(suite) -> [];
 otp_5305(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
 
     File = "t.erl",
     Test = <<"-module(t).
@@ -987,7 +987,7 @@ otp_5305(Config) when is_list(Config) ->
 
 otp_5418(suite) -> [];
 otp_5418(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
 
     File = "t.erl",
     Test = <<"-module(t).
@@ -1001,7 +1001,7 @@ otp_5418(Config) when is_list(Config) ->
 
 otp_6115(Config) when is_list(Config) ->
     {ok, CWD} = file:get_cwd(),
-    Dir = filename:join(?config(data_dir, Config), otp_6115),
+    Dir = filename:join(proplists:get_value(data_dir, Config), otp_6115),
     ok = file:set_cwd(Dir),
     {ok, f1} = compile:file(f1, [debug_info]),
     {ok, f2} = compile:file(f2, [debug_info]),
@@ -1053,7 +1053,7 @@ otp_7095(doc) ->
     ["andalso/orelse"];
 otp_7095(suite) -> [];
 otp_7095(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
 
     File = "t.erl",
     Test = <<"-module(t).
@@ -1165,10 +1165,10 @@ otp_8270(doc) ->
     ["OTP-8270. Bug."];
 otp_8270(suite) -> [];
 otp_8270(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     As = [{args," -pa " ++ PrivDir}],
     {ok,N1} = ?t:start_node(cover_n1,slave,As),
@@ -1601,10 +1601,10 @@ compile_beam_opts(doc) ->
 compile_beam_opts(suite) -> [];
 compile_beam_opts(Config) when is_list(Config) ->
     {ok, Cwd} = file:get_cwd(),
-    ok = file:set_cwd(?config(priv_dir, Config)),
-    IncDir = filename:join(?config(data_dir, Config),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
+    IncDir = filename:join(proplists:get_value(data_dir, Config),
                            "included_functions"),
-    File = filename:join([?config(data_dir, Config), "otp_11439", "t.erl"]),
+    File = filename:join([proplists:get_value(data_dir, Config), "otp_11439", "t.erl"]),
     %% use all compiler options allowed by cover:filter_options
     %% i and d don't make sense when compiling from beam though
     {ok, t} =
@@ -1635,7 +1635,7 @@ analyse_no_beam(doc) ->
 analyse_no_beam(suite) -> [];
 analyse_no_beam(Config) when is_list(Config) ->
     {ok, Cwd} = file:get_cwd(),
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     code:purge(t),
     code:delete(t),
@@ -1673,7 +1673,7 @@ analyse_no_beam(Config) when is_list(Config) ->
 %% file in this situation. The test below tests that this bug is
 %% corrected.
 line_0(Config) ->
-    ok = file:set_cwd(filename:join(?config(data_dir, Config),
+    ok = file:set_cwd(filename:join(proplists:get_value(data_dir, Config),
                                     "include_eunit_hrl")),
     {ok, cover_inc_eunit} = compile:file(cover_inc_eunit,[debug_info]),
     {ok, cover_inc_eunit} = cover:compile_beam(cover_inc_eunit),
@@ -1689,7 +1689,7 @@ line_0(Config) ->
 %% OTP-13200: Return error instead of crashing when trying to compile
 %% a beam which has no 'file' attribute.
 compile_beam_no_file(Config) ->
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     Dir = filename:join(PrivDir,"compile_beam_no_file"),
     ok = filelib:ensure_dir(filename:join(Dir,"*")),
     code:add_patha(Dir),
@@ -1759,7 +1759,7 @@ analyse_expr(Expr, Config) ->
 
 cc_mod(M, Binary, Config) ->
     {ok, Dir} = file:get_cwd(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = file:set_cwd(PrivDir),
     File = atom_to_list(M) ++ ".erl",
     try 
@@ -1771,7 +1771,7 @@ cc_mod(M, Binary, Config) ->
 
 c_mod(M, Binary, Config) ->
     {ok, Dir} = file:get_cwd(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = file:set_cwd(PrivDir),
     File = atom_to_list(M) ++ ".erl",
     try 
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 404b2fe738..ef0bcf5418 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -181,8 +181,8 @@ basic_test() ->
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 on_load_test(Config) ->
-    Priv = ?config(priv_dir, Config),
-    Data = ?config(data_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "cprof_SUITE_test"),
     Module = cprof_SUITE_test,
     M = 1000,
@@ -238,8 +238,8 @@ on_load_test(Config) ->
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 modules_test(Config) ->
-    Priv = ?config(priv_dir, Config),
-    Data = ?config(data_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "cprof_SUITE_test"),
     Module = cprof_SUITE_test,
     {ok,Module} = c:c(File, [{outdir,Priv}]),
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 2533a23dcc..2ea028e767 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -97,12 +97,12 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
     ok.
 
 maybe_skip(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     case filelib:is_dir(DataDir) of
 	false ->
 	    {skip, "No data directory"};
 	true ->
-	    case ?config(emem, Config) of
+	    case proplists:get_value(emem, Config) of
 		undefined ->
 		    {skip, "emem not found"};
 		_ ->
@@ -500,7 +500,7 @@ emem_comment(Config) when is_list(Config) ->
 
 emem_comment(Config, ExtraComment)
   when is_list(Config), is_list(ExtraComment) ->
-    case {?config(emem_comment, Config), ExtraComment} of
+    case {proplists:get_value(emem_comment, Config), ExtraComment} of
         {"", ""} -> ok;
         {"", XC} -> {comment, XC};
         {EmemC, ""} -> {comment, EmemC};
@@ -508,8 +508,8 @@ emem_comment(Config, ExtraComment)
     end.
 
 run_emem_on_casefile(Config) ->
-    CaseName = atom_to_list(?config(testcase, Config)),
-    File = filename:join([?config(data_dir, Config), CaseName ++ ".gz"]),
+    CaseName = atom_to_list(proplists:get_value(testcase, Config)),
+    File = filename:join([proplists:get_value(data_dir, Config), CaseName ++ ".gz"]),
     case check_file(File) of
         not_found ->
             ct:fail({error, {filenotfound, File}});
@@ -613,7 +613,7 @@ parse_emem_line(Line, Res) ->
     end.
 
 start_emem(Config) when is_list(Config) ->
-    Emem = ?config(emem, Config),
+    Emem = proplists:get_value(emem, Config),
     Cd = case ignore_cores:dir(Config) of
              false -> [];
              Dir -> [{cd, Dir}]
@@ -672,7 +672,7 @@ strip(Str) -> string:strip(Str).
 mk_nodename(Config) ->
     Us = erlang:monotonic_time(),
     atom_to_list(?MODULE)
-    ++ "-" ++ atom_to_list(?config(testcase, Config))
+    ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
     ++ integer_to_list(Us).
 
 start_node(Name, Args) ->
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index a8de8ff921..df288c2a47 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -37,8 +37,8 @@ basic(Config) when is_list(Config) ->
     %% load eprof_test and change directory
 
     {ok, OldCurDir} = file:get_cwd(),
-    Datadir = ?config(data_dir, Config),
-    Privdir = ?config(priv_dir, Config),
+    Datadir = proplists:get_value(data_dir, Config),
+    Privdir = proplists:get_value(priv_dir, Config),
     {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
 					       [trace,{outdir, Privdir}]),
     ok = file:set_cwd(Privdir),
@@ -123,8 +123,8 @@ basic_option_1(Config) ->
     %% load eprof_test and change directory
 
     {ok, OldCurDir} = file:get_cwd(),
-    Datadir = ?config(data_dir, Config),
-    Privdir = ?config(priv_dir, Config),
+    Datadir = proplists:get_value(data_dir, Config),
+    Privdir = proplists:get_value(priv_dir, Config),
     {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
 					       [trace,{outdir, Privdir}]),
     ok = file:set_cwd(Privdir),
@@ -166,8 +166,8 @@ tiny(suite) -> [];
 tiny(Config) when is_list(Config) -> 
     ensure_eprof_stopped(),
     {ok, OldCurDir} = file:get_cwd(),
-    Datadir = ?config(data_dir, Config),
-    Privdir = ?config(priv_dir, Config),
+    Datadir = proplists:get_value(data_dir, Config),
+    Privdir = proplists:get_value(priv_dir, Config),
     % (Trace)Compile to priv_dir and make sure the correct version is loaded.
     {ok,eprof_suite_test} = compile:file(filename:join(Datadir,
 							     "eprof_suite_test"),
@@ -189,8 +189,8 @@ tiny(Config) when is_list(Config) ->
 eed(suite) -> [];
 eed(Config) when is_list(Config) ->
     ensure_eprof_stopped(),
-    Datadir = ?config(data_dir, Config),
-    Privdir = ?config(priv_dir, Config),
+    Datadir = proplists:get_value(data_dir, Config),
+    Privdir = proplists:get_value(priv_dir, Config),
     ct:timetrap({minutes, 5}),
 
     %% (Trace)Compile to priv_dir and make sure the correct version is loaded.
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 1483c654c6..df40cff4b4 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -73,7 +73,7 @@ stack_seq(doc) ->
 stack_seq(suite) ->
     [];
 stack_seq(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile = filename:join(PrivDir,
                               ?MODULE_STRING"_stack_seq.trace"),
     AnalysisFile = filename:join(PrivDir,
@@ -122,7 +122,7 @@ tail_seq(doc) ->
 tail_seq(suite) ->
     [];
 tail_seq(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile = filename:join(PrivDir,
                               ?MODULE_STRING"_tail_seq.trace"),
     AnalysisFile = filename:join(PrivDir,
@@ -179,7 +179,7 @@ create_file_slow(Config) ->
     end.
 
 do_create_file_slow(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile = filename:join(PrivDir,
                               ?MODULE_STRING"_create_file_slow.trace"),
     AnalysisFile = filename:join(PrivDir,
@@ -233,7 +233,7 @@ spawn_simple(doc) ->
 spawn_simple(suite) ->
     [];
 spawn_simple(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile = filename:join(PrivDir,
                               ?MODULE_STRING"_spawn_simple.trace"),
     AnalysisFile = filename:join(PrivDir,
@@ -327,7 +327,7 @@ imm_tail_seq(doc) ->
 imm_tail_seq(suite) ->
     [];
 imm_tail_seq(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     AnalysisFile = filename:join(PrivDir,
                                  ?MODULE_STRING"_imm_tail_seq.analysis"),
     Start = 1,
@@ -389,7 +389,7 @@ imm_create_file_slow(doc) ->
 imm_create_file_slow(suite) ->
     [];
 imm_create_file_slow(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     DataFile = filename:join(PrivDir,
                              ?MODULE_STRING"_imm_create_file_slow.data"),
     AnalysisFile = filename:join(PrivDir,
@@ -439,9 +439,9 @@ imm_compile(suite) ->
     [];
 imm_compile(Config) when is_list(Config) ->
     ct:timetrap({minutes, 20}),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     SourceFile = filename:join(DataDir, "foo.erl"),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     AnalysisFile = filename:join(PrivDir,
                                  ?MODULE_STRING"_imm_compile.analysis"),
     ok = fprof:stop(kill),
@@ -499,7 +499,7 @@ cpu_create_file_slow(doc) ->
 cpu_create_file_slow(suite) ->
     [];
 cpu_create_file_slow(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TraceFile =
     filename:join(PrivDir, ?MODULE_STRING"_cpu_create_file_slow.trace"),
     AnalysisFile =
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
index e40b91392c..4af5efe834 100644
--- a/lib/tools/test/ignore_cores.erl
+++ b/lib/tools/test/ignore_cores.erl
@@ -53,7 +53,7 @@ init(Config) ->
 fini(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     ok = file:set_cwd(OrgCWD),
     true = code:set_path(OrgPath),
     case OrgPWD of
@@ -70,10 +70,10 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
                                             is_list(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
     true = code:set_path(Path),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     IgnDir = filename:join([PrivDir,
 			 atom_to_list(Suite)
 			 ++ "_"
@@ -119,7 +119,7 @@ restore(Config) ->
 		  org_path = OrgPath,
 		  org_pwd_env = OrgPWD,
 		  ign_dir = IgnDir,
-		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+		  cores_dir = CoresDir} = proplists:get_value(ignore_cores, Config),
     try
 	case CoresDir of
 	    false ->
@@ -155,5 +155,5 @@ restore(Config) ->
 
 
 dir(Config) ->
-    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    #ignore_cores{ign_dir = Dir} = proplists:get_value(ignore_cores, Config),
     Dir.
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 7917dedb49..bf6017e973 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -52,7 +52,7 @@ all() ->
 t_load(suite) -> [];
 t_load(doc) -> ["Load data from file."];
 t_load(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     Files = [filename:join([Path,"big_bang_40.lcnt"]),
 	     filename:join([Path,"ehb_3_3_hist.lcnt"])],
     ok = t_load_file(Files),
@@ -68,7 +68,7 @@ t_load_file([File|Files]) ->
 t_conflicts(suite) -> [];
 t_conflicts(doc) -> ["API: conflicts"];
 t_conflicts(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     Files = [filename:join([Path,"big_bang_40.lcnt"]),
 	     filename:join([Path,"ehb_3_3_hist.lcnt"])],
     ok = t_conflicts_file(Files),
@@ -102,7 +102,7 @@ test_conflicts_opts([Opt|Opts]) ->
 t_locations(suite) -> [];
 t_locations(doc) -> ["API: locations"];
 t_locations(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     Files = [filename:join([Path,"big_bang_40.lcnt"]),
 	     filename:join([Path,"ehb_3_3_hist.lcnt"])],
     ok = t_locations_file(Files),
@@ -135,7 +135,7 @@ test_locations_opts([Opt|Opts]) ->
 t_swap_keys(suite) -> [];
 t_swap_keys(doc) -> ["Test interchanging port/process id with class"];
 t_swap_keys(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     Files = [filename:join([Path,"big_bang_40.lcnt"]),
 	     filename:join([Path,"ehb_3_3_hist.lcnt"])],
     ok = t_swap_keys_file(Files),
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index c277d8c9ce..9c6141528e 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -129,8 +129,8 @@ ensure_exists([], _) ->
     ok.
 
 otp_6057_init(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Create the directories PrivDir/otp_6057/src1, /src2 and /ebin
     Src1 = filename:join([PrivDir, otp_6057, src1]),
@@ -168,7 +168,7 @@ otp_6057_a(suite) ->
 otp_6057_a(doc) ->
     ["Test that make:all/0, suite/0 looks for object file in correct place"];
 otp_6057_a(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Go to src1, saving old CWD
     {ok, CWD} = file:get_cwd(),
@@ -219,7 +219,7 @@ otp_6057_b(suite) ->
 otp_6057_b(doc) ->
     ["Test that make:files/1 can handle a file in another directory"];
 otp_6057_b(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Go to src1, saving old CWD
     {ok, CWD} = file:get_cwd(),
@@ -256,7 +256,7 @@ otp_6057_c(doc) ->
     ["Test that make:files/1 find options in Emakefile if a file is "
      "given with the .erl extension there"];
 otp_6057_c(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Go to src1, saving old CWD
     {ok, CWD} = file:get_cwd(),
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 295910e1a3..643ba9ad1a 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -32,9 +32,9 @@
 -else.
 -include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(datadir, ?config(data_dir, Conf)).
--define(privdir, ?config(priv_dir, Conf)).
--define(copydir, ?config(copy_dir, Conf)).
+-define(datadir, proplists:get_value(data_dir, Conf)).
+-define(privdir, proplists:get_value(priv_dir, Conf)).
+-define(copydir, proplists:get_value(copy_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0, groups/0,
@@ -1687,7 +1687,7 @@ fun_mfa(Conf) when is_list(Conf) ->
 %% Same as the previous test case, except that we use a BEAM file
 %% that was compiled by an R14 compiler to test backward compatibility.
 fun_mfa_r14(Conf) when is_list(Conf) ->
-    Dir = ?config(data_dir, Conf),
+    Dir = proplists:get_value(data_dir, Conf),
     MFile = fname(Dir, "fun_mfa_r14"),
 
     A = fun_mfa_r14,