6 files changed, 12 insertions, 12 deletions
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
index 10c8b4467a..48cdcea576 100644
--- a/lib/debugger/test/bug_SUITE.erl
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -55,7 +55,7 @@ end_per_group(_GroupName, Config) ->
 otp2163(doc) -> ["BIF exit reason"];
 otp2163(suite) -> [];
 otp2163(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
 
     %% First compile and get the expected results:
 
@@ -78,7 +78,7 @@ otp2163(Config) when is_list(Config) ->
 otp4845(doc) -> ["BIF not loading and not bug compatible, OTP-4845 OTP-4859"];
 otp4845(suite) -> [];
 otp4845(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
 
     %% First compile and get the expected results:
 
diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl
index 00bf85c378..e18c1ae8e2 100644
--- a/lib/debugger/test/dbg_ui_SUITE.erl
+++ b/lib/debugger/test/dbg_ui_SUITE.erl
@@ -104,7 +104,7 @@ dbg_ui (_Config) ->
 
 check(Case, Config) ->
 
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line ResultFileName =  filename:join([DataDir, "manual_results.erl"]),
     case file:consult(ResultFileName) of
 	{ok, Results} ->
diff --git a/lib/debugger/test/debugger_SUITE.erl b/lib/debugger/test/debugger_SUITE.erl
index 6ffa5f7ef4..c83d6cc92f 100644
--- a/lib/debugger/test/debugger_SUITE.erl
+++ b/lib/debugger/test/debugger_SUITE.erl
@@ -73,7 +73,7 @@ erts_debug(Config) when is_list(Config) ->
     ok.
 
 no_abstract_code(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ?line Simple = filename:join(PrivDir, "simple"),
     ?line Source = Simple ++ ".erl",
     ?line BeamFile = Simple ++ ".beam",
@@ -100,7 +100,7 @@ encrypted_debug_info(Config) when is_list(Config) ->
     end.
 
 encrypted_debug_info_1(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ?line Simple = filename:join(PrivDir, "simple"),
     ?line Source = Simple ++ ".erl",
     ?line BeamFile = Simple ++ ".beam",
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
index 4601e516b2..9d9211542c 100644
--- a/lib/debugger/test/int_SUITE.erl
+++ b/lib/debugger/test/int_SUITE.erl
@@ -36,7 +36,7 @@ init_per_testcase(interpretable, Config) ->
 init_per_testcase(_Case, Config) ->
 
     %% Interpret some existing and non-existing modules
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line {module, lists1} = int:i(filename:join([DataDir,lists1])),
     ?line {module, guards} = int:i(filename:join([DataDir,guards])),
 
@@ -92,7 +92,7 @@ interpret(Config) when is_list(Config) ->
     ?line int:n(int:interpreted()),
 
     %% Interpret some existing and non-existing modules
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line {module, lists1} = int:i(filename:join([DataDir,lists1])),
     ?line {module, ordsets1} = int:i(filename:join([DataDir,ordsets1])),
     ?line error = int:i(non_existent_module),
@@ -240,14 +240,14 @@ interpretable(Config) when is_list(Config) ->
     end,
 
     %% true
-    ?line DataDir = filename:dirname(?config(data_dir, Config)),
+    DataDir = filename:dirname(proplists:get_value(data_dir, Config)),
     ?line true = code:add_patha(DataDir),
     ?line true = int:interpretable(lists1),
     ?line true = int:interpretable(filename:join([DataDir,lists1])),
     ?line true = code:del_path(DataDir),
 
     %% true (from source)
-    PrivDir = filename:join(?config(priv_dir, Config), ""),
+    PrivDir = filename:join(proplists:get_value(priv_dir, Config), ""),
     {ok, _} = file:copy(filename:join([DataDir,"lists1.beam"]),
 			      filename:join([PrivDir,"lists1.beam"])),
     true = code:add_patha(PrivDir),
diff --git a/lib/debugger/test/int_break_SUITE.erl b/lib/debugger/test/int_break_SUITE.erl
index d50dc7d0eb..ef770c7a93 100644
--- a/lib/debugger/test/int_break_SUITE.erl
+++ b/lib/debugger/test/int_break_SUITE.erl
@@ -55,7 +55,7 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line Mod = ordsets1,
     ?line {module,Mod} = int:i(filename:join(DataDir, Mod)),
     ?line ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index abb6c7e3ff..9639b67c6c 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -64,7 +64,7 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line {module,?IM} = int:i(filename:join(DataDir, ?IM)),
     ?line ok = io:format("Interpreted modules: ~p",[int:interpreted()]),
     Config.
@@ -300,7 +300,7 @@ maps(Config) when is_list(Config) ->
 
 
 do_eval(Config, Mod) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     ?line ok = file:set_cwd(DataDir),
 
     ?line {ok,Mod} = compile:file(Mod, [report,debug_info]),