From 5611e47606d8d691331f2eb4b7ed87bdd8ba9270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 9 Mar 2016 16:52:21 +0100
Subject: Eliminate use of ?config() macro

---
 erts/emulator/test/a_SUITE.erl                  |  2 +-
 erts/emulator/test/alloc_SUITE.erl              |  8 ++--
 erts/emulator/test/async_ports_SUITE.erl        |  2 +-
 erts/emulator/test/beam_SUITE.erl               |  2 +-
 erts/emulator/test/beam_literals_SUITE.erl      |  2 +-
 erts/emulator/test/big_SUITE.erl                |  4 +-
 erts/emulator/test/binary_SUITE.erl             |  6 +--
 erts/emulator/test/bs_construct_SUITE.erl       |  2 +-
 erts/emulator/test/busy_port_SUITE.erl          | 10 ++---
 erts/emulator/test/call_trace_SUITE.erl         |  2 +-
 erts/emulator/test/code_SUITE.erl               | 34 ++++++++--------
 erts/emulator/test/code_parallel_load_SUITE.erl |  2 +-
 erts/emulator/test/ddll_SUITE.erl               | 54 ++++++++++++-------------
 erts/emulator/test/distribution_SUITE.erl       |  4 +-
 erts/emulator/test/driver_SUITE.erl             | 40 +++++++++---------
 erts/emulator/test/efile_SUITE.erl              |  4 +-
 erts/emulator/test/erl_drv_thread_SUITE.erl     |  2 +-
 erts/emulator/test/erts_debug_SUITE.erl         |  2 +-
 erts/emulator/test/estone_SUITE.erl             |  4 +-
 erts/emulator/test/float_SUITE.erl              |  6 +--
 erts/emulator/test/fun_SUITE.erl                |  4 +-
 erts/emulator/test/ignore_cores.erl             | 10 ++---
 erts/emulator/test/message_queue_data_SUITE.erl |  2 +-
 erts/emulator/test/module_info_SUITE.erl        |  2 +-
 erts/emulator/test/monitor_SUITE.erl            |  2 +-
 erts/emulator/test/mtx_SUITE.erl                |  2 +-
 erts/emulator/test/nif_SUITE.erl                | 12 +++---
 erts/emulator/test/nif_SUITE_data/nif_mod.erl   |  2 +-
 erts/emulator/test/nif_SUITE_data/tester.erl    |  2 +-
 erts/emulator/test/old_scheduler_SUITE.erl      |  4 +-
 erts/emulator/test/port_SUITE.erl               | 42 +++++++++----------
 erts/emulator/test/port_bif_SUITE.erl           | 12 +++---
 erts/emulator/test/process_SUITE.erl            |  4 +-
 erts/emulator/test/scheduler_SUITE.erl          |  6 +--
 erts/emulator/test/send_term_SUITE.erl          |  4 +-
 erts/emulator/test/signal_SUITE.erl             |  2 +-
 erts/emulator/test/smoke_test_SUITE.erl         |  2 +-
 erts/emulator/test/system_info_SUITE.erl        |  2 +-
 erts/emulator/test/system_profile_SUITE.erl     |  2 +-
 erts/emulator/test/time_SUITE.erl               |  2 +-
 erts/emulator/test/trace_SUITE.erl              |  2 +-
 erts/emulator/test/trace_call_time_SUITE.erl    |  2 +-
 erts/emulator/test/trace_local_SUITE.erl        |  4 +-
 erts/emulator/test/trace_nif_SUITE.erl          |  2 +-
 erts/emulator/test/trace_port_SUITE.erl         |  2 +-
 erts/emulator/test/tuple_SUITE.erl              |  2 +-
 erts/emulator/test/unique_SUITE.erl             |  2 +-
 47 files changed, 164 insertions(+), 164 deletions(-)

(limited to 'erts')

diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index ec0c42db06..ebaf23b28a 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -43,7 +43,7 @@ long_timers(doc) ->
 long_timers(suite) ->
     [];
 long_timers(Config) when is_list(Config) ->
-    Dir = ?config(data_dir, Config),
+    Dir = proplists:get_value(data_dir, Config),
     ?line long_timers_test:start(Dir),
     ?line {comment,
 	   "Testcase started! This test will run in parallel with the "
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 81b52525e3..419f92c4a6 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -182,8 +182,8 @@ drv_case(Config, Mode, NodeOpts) when is_list(Config) ->
     end.
 
 run_drv_case(Config, Mode) ->
-    DataDir = ?config(data_dir,Config),
-    CaseName = ?config(testcase,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    CaseName = proplists:get_value(testcase,Config),
     File = filename:join(DataDir, CaseName),
     {ok,CaseName,Bin} = compile:file(File, [binary,return_errors]),
     {module,CaseName} = erlang:load_module(CaseName,Bin),
@@ -341,7 +341,7 @@ handle_result(_State, Result0) ->
     end.
 
 start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
-    case ?config(debug,Config) of
+    case proplists:get_value(debug,Config) of
 	true -> {ok, node()};
 	_ -> start_node_1(Config, Opts)
     end.
@@ -350,7 +350,7 @@ start_node_1(Config, Opts) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
diff --git a/erts/emulator/test/async_ports_SUITE.erl b/erts/emulator/test/async_ports_SUITE.erl
index 9647d87c32..f0f5fb5687 100644
--- a/erts/emulator/test/async_ports_SUITE.erl
+++ b/erts/emulator/test/async_ports_SUITE.erl
@@ -21,7 +21,7 @@ all() ->
     [permanent_busy_test].
 
 permanent_busy_test(Config) ->
-    ExePath = filename:join(?config(data_dir, Config), "cport"),
+    ExePath = filename:join(proplists:get_value(data_dir, Config), "cport"),
     Self = self(),
     spawn_link(
       fun() ->
diff --git a/erts/emulator/test/beam_SUITE.erl b/erts/emulator/test/beam_SUITE.erl
index d2b234ae07..07dfeb6633 100644
--- a/erts/emulator/test/beam_SUITE.erl
+++ b/erts/emulator/test/beam_SUITE.erl
@@ -95,7 +95,7 @@ apply_last_bif(Config) when is_list(Config) ->
 %% Test three high register numbers in a put_list instruction
 %% (to test whether packing works properly).
 packed_registers(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Mod = packed_regs,
     Name = filename:join(PrivDir, atom_to_list(Mod) ++ ".erl"),
 
diff --git a/erts/emulator/test/beam_literals_SUITE.erl b/erts/emulator/test/beam_literals_SUITE.erl
index 29c6a5c7ac..4cfc8e7d12 100644
--- a/erts/emulator/test/beam_literals_SUITE.erl
+++ b/erts/emulator/test/beam_literals_SUITE.erl
@@ -428,7 +428,7 @@ fconv_2(F) when is_float(F) ->
     6.0 + F.
 
 literal_case_expression(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    ?line DataDir = proplists:get_value(data_dir, Config),
     ?line Src = filename:join(DataDir, "literal_case_expression"),
     ?line {ok,literal_case_expression=Mod,Code} =
 	compile:file(Src, [from_asm,binary]),
diff --git a/erts/emulator/test/big_SUITE.erl b/erts/emulator/test/big_SUITE.erl
index 37e90df60e..3cc812784a 100644
--- a/erts/emulator/test/big_SUITE.erl
+++ b/erts/emulator/test/big_SUITE.erl
@@ -87,7 +87,7 @@ negative(Config) when is_list(Config) ->
 
 %% Find test file
 test_file(Config, Name) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     filename:join(DataDir, Name).
 
 %%
@@ -256,7 +256,7 @@ big_literals(doc) ->
 big_literals(Config) when is_list(Config) ->
     %% Note: The literal test cannot be compiler on a pre-R4 Beam emulator,
     %% so we compile it now.
-    ?line DataDir = ?config(data_dir, Config),
+    ?line DataDir = proplists:get_value(data_dir, Config),
     ?line Test = filename:join(DataDir, "literal_test"),
     ?line {ok, Mod, Bin} = compile:file(Test, [binary]),
     ?line {module, Mod} = code:load_binary(Mod, Mod, Bin),
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 6ace683fe7..576bcd0688 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -697,7 +697,7 @@ corrupter(_Bin, _) ->
 
 more_bad_terms(suite) -> [];
 more_bad_terms(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line BadFile = filename:join(Data, "bad_binary"),
     ?line ok = io:format("File: ~s\n", [BadFile]),
     ?line case file:read_file(BadFile) of
@@ -999,7 +999,7 @@ ordering(Config) when is_list(Config) ->
     ?line true = B1 > fun() -> 1 end,
     ?line true = B1 > fun erlang:send/2,
 
-    ?line Path = ?config(priv_dir, Config),
+    ?line Path = proplists:get_value(priv_dir, Config),
     ?line AFile = filename:join(Path, "vanilla_file"),
     ?line Port = open_port(AFile, [out]),
     ?line true = B1 > Port,
@@ -1332,7 +1332,7 @@ robustness(Config) when is_list(Config) ->
 %% OTP-8180: Test several terms that have been known to crash the emulator.
 %% (Thanks to Scott Lystig Fritchie.)
 otp_8180(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line Wc = filename:join(Data, "zzz.*"),
     Files = filelib:wildcard(Wc),
     [run_otp_8180(F) || F <- Files],
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index 42a710aaf9..bc5fb4f379 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -787,7 +787,7 @@ bs_add(Config) when is_list(Config) ->
 	 return],
 
     %% Write assembly file and assemble it.
-    ?line PrivDir = ?config(priv_dir, Config),
+    ?line PrivDir = proplists:get_value(priv_dir, Config),
     ?line RootName = filename:join(PrivDir, atom_to_list(Mod)),
     ?line AsmFile = RootName ++ ".S",
     ?line {ok,Fd} = file:open(AsmFile, [write]),
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index 172936dd82..ee82356646 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -375,7 +375,7 @@ hs_test(Config, HardBusy) when is_list(Config) ->
 			false -> 'soft_busy_drv'
 		    end,
     ?line erl_ddll:start(),
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     case erl_ddll:load_driver(Path, DrvName) of
 	ok -> ok;
 	{error, Error} ->
@@ -525,7 +525,7 @@ scheduling_delay_busy(Config) ->
 
     Validation = [{seq,10,lists:seq(1,50)}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 scheduling_delay_busy_nosuspend(Config) ->
 
@@ -544,7 +544,7 @@ scheduling_delay_busy_nosuspend(Config) ->
 
     Validation = [{eq,10,nosuspend},{seq,20,[1,2]}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 scheduling_busy_link(Config) ->
     
@@ -567,7 +567,7 @@ scheduling_busy_link(Config) ->
     Validation = [{seq,10,[1]},
 		  {seq,20,[{'EXIT',noproc}]}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 process_init(DrvName,Owner) ->
     process_flag(trap_exit,true),
@@ -862,7 +862,7 @@ fun_spawn(Fun, Args) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 load_busy_driver(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    ?line DataDir = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
     case erl_ddll:load_driver(DataDir, "busy_drv") of
 	ok -> ok;
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index d99bba32cd..6035de9d75 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -366,7 +366,7 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
     ok.
 
 compile_version(Module, Version, Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, atom_to_list(Module)),
     {ok,Module,Bin} = compile:file(File, [{d,'VERSION',Version},
 					    binary,report]),
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index a040eee50a..0c09fe6f7b 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -89,7 +89,7 @@ versions(Config) when is_list(Config) ->
     ok.
 
 compile_version(Version, Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "versions"),
     {ok,versions,Bin} = compile:file(File, [{d,'VERSION',Version},
 					    binary,report]),
@@ -114,7 +114,7 @@ check_version(Pid) ->
     end.
 
 new_binary_types(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
     ?line {ok,my_code_test,Bin} = compile:file(File, [binary]),
     ?line {module,my_code_test} = erlang:load_module(my_code_test,
@@ -138,8 +138,8 @@ new_binary_types(Config) when is_list(Config) ->
     ok.
 
 t_check_process_code(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
+    ?line Priv = proplists:get_value(priv_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
     ?line Code = filename:join(Priv, "my_code_test"),
 
@@ -250,8 +250,8 @@ t_check_process_code_ets(Config) when is_list(Config) ->
     end.
 
 do_check_process_code_ets(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
+    ?line Priv = proplists:get_value(priv_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
 
     ?line erlang:purge_module(my_code_test),
@@ -303,7 +303,7 @@ fun_refc(F) ->
 
 %% Test the erlang:check_old_code/1 BIF.
 t_check_old_code(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
 
     ?line erlang:purge_module(my_code_test),
@@ -334,7 +334,7 @@ external_fun(Config) when is_list(Config) ->
     ?line {'EXIT',{undef,_}} = (catch ExtFun(answer)),
     ?line false = erlang:function_exported(another_code_test, x, 1),
     ?line false = lists:member(another_code_test, erlang:loaded()),
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "another_code_test"),
     ?line {ok,another_code_test,Code} = compile:file(File, [binary,report]),
     ?line {module,another_code_test} = erlang:load_module(another_code_test, Code),
@@ -342,7 +342,7 @@ external_fun(Config) when is_list(Config) ->
     ok.
 
 get_chunk(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
     ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
 
@@ -367,7 +367,7 @@ get_chunk_ok(Chunk, Code) ->
     end.
 
 module_md5(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
     ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
 
@@ -393,7 +393,7 @@ make_stub(Config) when is_list(Config) ->
     catch erlang:purge_module(my_code_test),
     MD5 = erlang:md5(<<>>),
 
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "my_code_test"),
     ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
 
@@ -428,7 +428,7 @@ make_stub_many_funs(Config) when is_list(Config) ->
     catch erlang:purge_module(many_funs),
     MD5 = erlang:md5(<<>>),
 
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "many_funs"),
     ?line {ok,many_funs,Code} = compile:file(File, [binary]),
 
@@ -451,7 +451,7 @@ make_stub_many_funs(Config) when is_list(Config) ->
     ok.
 
 constant_pools(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "literals"),
     ?line {ok,literals,Code} = compile:file(File, [report,binary]),
     ?line {module,literals} = erlang:load_module(literals,
@@ -530,7 +530,7 @@ constant_refc_binaries(Config) when is_list(Config) ->
     io:format("Binary data (bytes) before test: ~p\n", [Bef]),
 
     %% Compile the the literals module.
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "literals"),
     {ok,literals,Code} = compile:file(File, [report,binary]),
 
@@ -652,7 +652,7 @@ wait_for_memory_deallocations() ->
 %% OTP-7559: c_p->cp could contain garbage and create a false dependency
 %% to a module in a process. (Thanks to Richard Carlsson.)
 false_dependency(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "cpbugx"),
     ?line {ok,cpbugx,Code} = compile:file(File, [binary,report]),
 
@@ -731,7 +731,7 @@ coverage(Config) when is_list(Config) ->
     ok.
 
 fun_confusion(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Src = filename:join(Data, "fun_confusion"),
     Mod = fun_confusion,
 
@@ -757,7 +757,7 @@ compile_load(Mod, Src, Ver) ->
 
 t_copy_literals(Config) when is_list(Config) ->
     %% Compile the the literals module.
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "literals"),
     {ok,literals,Code} = compile:file(File, [report,binary]),
     {module,literals} = erlang:load_module(literals, Code),
diff --git a/erts/emulator/test/code_parallel_load_SUITE.erl b/erts/emulator/test/code_parallel_load_SUITE.erl
index 95cf9ddac4..e9e7000434 100644
--- a/erts/emulator/test/code_parallel_load_SUITE.erl
+++ b/erts/emulator/test/code_parallel_load_SUITE.erl
@@ -46,7 +46,7 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Config.
 
 end_per_testcase(_Func, Config) ->
-    SConf = ?config(save_config, Config),
+    SConf = proplists:get_value(save_config, Config),
     Pids  = proplists:get_value(purge_pids, SConf),
 
     case check_old_code(?model) of
diff --git a/erts/emulator/test/ddll_SUITE.erl b/erts/emulator/test/ddll_SUITE.erl
index 0288c9d243..5ef751a4cd 100644
--- a/erts/emulator/test/ddll_SUITE.erl
+++ b/erts/emulator/test/ddll_SUITE.erl
@@ -76,7 +76,7 @@ unload_on_process_exit(suite) ->
 unload_on_process_exit(doc) ->
     ["Check that the driver is unloaded on process exit"];
 unload_on_process_exit(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     Parent = self(),
     ?line Pid = spawn(fun() ->
@@ -108,7 +108,7 @@ delayed_unload_with_ports(suite) ->
 delayed_unload_with_ports(doc) ->
     ["Check that the driver is unloaded when the last port is closed"];
 delayed_unload_with_ports(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:try_load(Path, echo_drv, []),
     ?line erl_ddll:try_load(Path, echo_drv, []),
     ?line Port = open_port({spawn, echo_drv}, [eof]),
@@ -131,7 +131,7 @@ unload_due_to_process_exit(suite) ->
 unload_due_to_process_exit(doc) ->
     ["Check that the driver with ports is unloaded on process exit"];
 unload_due_to_process_exit(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line F3 = fun() -> 
 		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
@@ -163,7 +163,7 @@ no_unload_due_to_process_exit(suite) ->
 no_unload_due_to_process_exit(doc) ->
     ["Check that a driver with driver loaded in another process is not unloaded on process exit"];
 no_unload_due_to_process_exit(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line F3 = fun() -> 
 		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
@@ -198,7 +198,7 @@ no_unload_due_to_process_exit_2(suite) ->
 no_unload_due_to_process_exit_2(doc) ->
     ["Check that a driver with open ports in another process is not unloaded on process exit"];
 no_unload_due_to_process_exit_2(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line F3 = fun() -> 
 		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
@@ -233,7 +233,7 @@ unload_reload_thingie(suite) ->
 unload_reload_thingie(doc) ->
     ["Check delayed unload and reload"];
 unload_reload_thingie(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
     ?line F3 = fun() -> 
@@ -276,7 +276,7 @@ unload_reload_thingie_2(suite) ->
 unload_reload_thingie_2(doc) ->
     ["Check delayed unload and reload"];
 unload_reload_thingie_2(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
     ?line F3 = fun() -> 
@@ -318,7 +318,7 @@ unload_reload_thingie_3(suite) ->
 unload_reload_thingie_3(doc) ->
     ["Check delayed unload and reload failure"];
 unload_reload_thingie_3(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
     ?line F3 = fun() -> 
@@ -360,7 +360,7 @@ unload_reload_thingie_3(Config) when is_list(Config) ->
 reload_pending(suite) -> [];
 reload_pending(doc) -> ["Reload a driver that is pending on a user"];
 reload_pending(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line F3 = fun() -> 
 		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
@@ -410,8 +410,8 @@ reload_pending(Config) when is_list(Config) ->
 load_fail_init(suite) -> [];
 load_fail_init(doc) -> ["Tests failure in the init in driver struct."];
 load_fail_init(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line PathFailing = ?config(priv_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
+    ?line PathFailing = proplists:get_value(priv_dir, Config),
     ?line [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
     ?line lists:foreach(fun(Name) ->
 				Src = filename:join([Path,Name]),
@@ -436,8 +436,8 @@ load_fail_init(Config) when is_list(Config) ->
 reload_pending_fail_init(suite) -> [];
 reload_pending_fail_init(doc) -> ["Reload a driver that is pending but init fails"];
 reload_pending_fail_init(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line PathFailing = ?config(priv_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
+    ?line PathFailing = proplists:get_value(priv_dir, Config),
     ?line [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
     ?line lists:foreach(fun(Name) ->
 				Src = filename:join([Path,Name]),
@@ -496,7 +496,7 @@ reload_pending_kill(doc) -> ["Reload a driver with kill_ports option "
 			     "that is pending on a user"];
 reload_pending_kill(Config) when is_list(Config) ->
     ?line OldFlag = process_flag(trap_exit,true),
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line F3 = fun() -> 
 		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
@@ -599,7 +599,7 @@ forced_port_killing(suite) ->
 forced_port_killing(doc) ->
     ["Check kill_ports option to try_unload "];
 forced_port_killing(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line OldFlag=process_flag(trap_exit,true),
     ?line Parent = self(),
     ?line F3 = fun() -> 
@@ -633,7 +633,7 @@ no_trap_exit_and_kill_ports(suite) ->
 no_trap_exit_and_kill_ports(doc) ->
     ["Check delayed unload and reload with no trap_exit"];
 no_trap_exit_and_kill_ports(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line Parent = self(),
     ?line OldFlag=process_flag(trap_exit,true),
     ?line F3 = fun() -> 
@@ -672,7 +672,7 @@ monitor_demonitor(suite) ->
 monitor_demonitor(doc) ->
     ["Check monitor and demonitor of drivers"];
 monitor_demonitor(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:try_load(Path, echo_drv, []),
     ?line Ref = erl_ddll:monitor(driver,{echo_drv,unloaded}),
     ?line Self = self(),
@@ -688,7 +688,7 @@ monitor_demonitor_load(suite) ->
 monitor_demonitor_load(doc) ->
     ["Check monitor/demonitor of driver loading"];
 monitor_demonitor_load(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok,loaded} = erl_ddll:try_load(Path, echo_drv, []),
     ?line Port = open_port({spawn, echo_drv}, [eof]),
     ?line Ref = erl_ddll:monitor(driver,{echo_drv,loaded}),
@@ -717,7 +717,7 @@ new_interface(suite) ->
 new_interface(doc) ->
     ["Test the new load/unload/reload interface"];
 new_interface(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     % Typical scenario
     ?line ok = erl_ddll:load(Path, echo_drv),
     ?line Port = open_port({spawn, echo_drv}, [eof]),
@@ -777,7 +777,7 @@ new_interface(Config) when is_list(Config) ->
 
 
 ddll_test(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     %?line {error,{already_started,ErlDdllPid}} = erl_ddll:start(),
     %?line ErlDdllPid = whereis(ddll_server),
@@ -811,7 +811,7 @@ ddll_test(Config) when is_list(Config) ->
 %% Tests errors having to do with bad drivers.
 
 errors(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     ?line {ok, L1} = erl_ddll:loaded_drivers(),
 
@@ -839,7 +839,7 @@ reference_count(doc) ->
      "reaches zero, and that they cannot be unloaded while ",
      "they are still referenced."];
 reference_count(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
@@ -881,7 +881,7 @@ kill_port(doc) ->
     ["Test that a port that uses a driver is killed when the ",
      "process that loaded the driver dies."];
 kill_port(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
@@ -916,7 +916,7 @@ dont_kill_port(doc) ->
     ["Test that a port that uses a driver is not killed when the ",
      "process that loaded the driver dies and it's nicely opened."];
 dont_kill_port(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
@@ -954,7 +954,7 @@ dont_kill_port(Config) when is_list(Config) ->
 properties(doc) -> ["Test that a process that loaded a driver ",
 		    "is the only process that can unload it."];
 properties(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
 
     % Let another process load the echo driver.
     Pid=spawn_link(?MODULE, echo_loader, [Path, self()]),
@@ -980,7 +980,7 @@ properties(Config) when is_list(Config) ->
 
 load_and_unload(doc) -> ["Load two drivers and unload them in load order."];
 load_and_unload(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok, Loaded_drivers1} = erl_ddll:loaded_drivers(),
     ?line ok = erl_ddll:load_driver(Path, echo_drv),
     ?line ok = erl_ddll:load_driver(Path, dummy_drv),
@@ -998,7 +998,7 @@ lock_driver(suite) ->
 lock_driver(doc) ->
     ["Check multiple calls to driver_lock_driver"];
 lock_driver(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line {ok, _} = erl_ddll:try_load(Path, lock_drv, []),
     ?line Port1 = open_port({spawn, lock_drv}, [eof]),
     ?line Port2 = open_port({spawn, lock_drv}, [eof]),
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 1425276544..5f2ecdcbe1 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -729,7 +729,7 @@ stop_dist(doc) ->
 stop_dist(Config) when is_list(Config) ->
     ?line Str = os:cmd(atom_to_list(lib:progname())
 		       ++ " -noshell -pa "
-		       ++ ?config(data_dir, Config)
+		       ++ proplists:get_value(data_dir, Config)
 		       ++ " -s run"),
     %% The "true" may be followed by an error report, so ignore anything that
     %% follows it.
@@ -1950,7 +1950,7 @@ start_node(Name, Args, Rel) when is_atom(Name), is_list(Rel) ->
 start_node(Config, Args, Rel) when is_list(Config), is_list(Rel) ->
     Name = list_to_atom((atom_to_list(?MODULE)
 			 ++ "-"
-			 ++ atom_to_list(?config(testcase, Config))
+			 ++ atom_to_list(proplists:get_value(testcase, Config))
 			 ++ "-"
 			 ++ integer_to_list(erlang:system_time(seconds))
 			 ++ "-"
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 3da99b4090..37ad0fd79d 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -181,7 +181,7 @@ end_per_group(_GroupName, Config) ->
 
 outputv_errors(doc) -> "Test sending bad types to port with an outputv-capable driver.";
 outputv_errors(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
     ?line ok = load_driver(Path, outputv_drv),
 
@@ -720,7 +720,7 @@ driver_unloaded(Config) when is_list(Config) ->
     ?line Die = make_ref(),
     ?line Loader = spawn(fun () ->
 				 erl_ddll:start(),
-				 ok = load_driver(?config(data_dir,
+				 ok = load_driver(proplists:get_value(data_dir,
 								   Config),
 							   Drv),
 				 User ! Loaded,
@@ -755,7 +755,7 @@ io_ready_exit(Config) when is_list(Config) ->
     ?line receive dgawd_handler_started -> ok end,
     ?line Drv = io_ready_exit_drv,
     ?line erl_ddll:start(),
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
+    ?line ok = load_driver(proplists:get_value(data_dir, Config), Drv),
     ?line Port = open_port({spawn, Drv}, []),
     ?line case erlang:port_control(Port, 0, "") of
 	      "ok" ->
@@ -909,7 +909,7 @@ chkio_test_init(Config) when is_list(Config) ->
     ?line case catch lists:keysearch(name, 1, ChkIo) of
 	      {value, {name, erts_poll}} ->
 		  ?line io:format("Before test: ~p~n", [ChkIo]),
-		  ?line Path = ?config(data_dir, Config),
+		  ?line Path = proplists:get_value(data_dir, Config),
 		  ?line erl_ddll:start(),
 		  ?line ok = load_driver(Path, 'chkio_drv'),
 		  ?line process_flag(trap_exit, true),
@@ -1386,7 +1386,7 @@ ioq_exit_test(Config, TestNo) ->
     ?line Drv = ioq_exit_drv,
     ?line try
 	      begin
-		  ?line case load_driver(?config(data_dir, Config),
+		  ?line case load_driver(proplists:get_value(data_dir, Config),
 						  Drv) of
 			    ok -> ?line ok;
 			    {error, permanent} -> ?line ok;
@@ -1468,8 +1468,8 @@ ioq_exit_event_async(Config) when is_list(Config) ->
 
 
 vsn_mismatch_test(Config, LoadResult) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line DrvName = ?config(testcase, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
+    ?line DrvName = proplists:get_value(testcase, Config),
     ?line LoadResult = load_driver(Path, DrvName),
     ?line case LoadResult of
 	      ok ->
@@ -1529,7 +1529,7 @@ peek_non_existing_queue(Config) when is_list(Config) ->
     ?line Drv = peek_non_existing_queue_drv,
     ?line try
 	      begin
-		  ?line case load_driver(?config(data_dir, Config),
+		  ?line case load_driver(proplists:get_value(data_dir, Config),
 						  Drv) of
 			    ok -> ?line ok;
 			    {error, permanent} -> ?line ok;
@@ -1581,7 +1581,7 @@ otp_6879(suite) ->
 otp_6879(Config) when is_list(Config) ->
     ?line Drv = 'otp_6879_drv',
     ?line Parent = self(),
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
+    ?line ok = load_driver(proplists:get_value(data_dir, Config), Drv),
     ?line Procs = lists:map(
 		    fun (No) ->
 			    spawn_link(
@@ -1647,7 +1647,7 @@ run_caller_test(Config, Outputv) ->
 					"false"),
 			output
 		end,
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
+    ?line ok = load_driver(proplists:get_value(data_dir, Config), Drv),
     ?line Port = open_port({spawn, Drv}, []),
     ?line true = is_port(Port),
     ?line chk_caller(Port, start, self()),
@@ -1736,7 +1736,7 @@ smp_select(Config) when is_list(Config) ->
     
 smp_select0(Config) ->
     ?line DrvName = 'chkio_drv',
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ?line ok = load_driver(Path, DrvName),    
     Master = self(),
@@ -1795,7 +1795,7 @@ driver_select_use(Config) when is_list(Config) ->
     
 driver_select_use0(Config) ->
     ?line DrvName = 'chkio_drv',
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ?line ok = load_driver(Path, DrvName),    
     ?line Port = open_port({spawn, DrvName}, []),
@@ -1823,7 +1823,7 @@ thread_mseg_alloc_cache_clean(Config) when is_list(Config) ->
 	    ?line {skipped, "driver_alloc() using too low single block threshold"};
 	{true, _MsegAllocInfo, SBCT} ->
 	    ?line DrvName = 'thr_alloc_drv',
-	    ?line Path = ?config(data_dir, Config),
+	    ?line Path = proplists:get_value(data_dir, Config),
 	    ?line erl_ddll:start(),
 	    ?line ok = load_driver(Path, DrvName),   
 	    ?line Port = open_port({spawn, DrvName}, []),
@@ -1908,7 +1908,7 @@ thread_mseg_alloc_cache_clean_test(Port, N, CCI, Size) ->
     ?line thread_mseg_alloc_cache_clean_test(Port, N-1, CCI, Size).
 
 otp_9302(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
     ?line ok = load_driver(Path, otp_9302_drv),
     ?line Port = open_port({spawn, otp_9302_drv}, []),
@@ -1950,7 +1950,7 @@ thr_free_drv(Config) when is_list(Config) ->
     end.
 
 thr_free_drv_do(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
     ?line ok = load_driver(Path, thr_free_drv),
     ?line MemBefore = driver_alloc_size(),
@@ -1982,7 +1982,7 @@ thr_free_drv_control(Port, N) ->
     end.
 	    
 async_blast(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line erl_ddll:start(),
     ?line ok = load_driver(Path, async_blast_drv),
     ?line SchedOnln = erlang:system_info(schedulers_online),
@@ -2045,7 +2045,7 @@ thr_msg_blast(Config) when is_list(Config) ->
 	false ->
 	    {skipped, "Non-SMP emulator; nothing to test..."};
 	true ->
-	    Path = ?config(data_dir, Config),
+	    Path = proplists:get_value(data_dir, Config),
 	    erl_ddll:start(),
 	    ok = load_driver(Path, thr_msg_blast_drv),
 	    MemBefore = driver_alloc_size(),
@@ -2124,7 +2124,7 @@ consume_timeslice(Config) when is_list(Config) ->
     %% the port instead.
     %%
 
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(Path, consume_timeslice_drv),
     Port = open_port({spawn, consume_timeslice_drv}, [{parallelism, false}]),
@@ -2518,7 +2518,7 @@ erl_millisecs(MonotonicTime) ->
 
 %% Start/stop drivers.
 start_driver(Config, Name, Binary) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
 
     %% Load the driver
@@ -2566,7 +2566,7 @@ start_node(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index 79a2d20fe0..cc061c0cfe 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -90,7 +90,7 @@ file_keys(Dir,Num,FdList,FnList) ->
 async_dist(doc) ->
     "Check that the distribution of files over async threads is fair";
 async_dist(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
     Dir = filename:dirname(code:which(?MODULE)),
     AsyncSizes = [7,10,100,255,256,64,63,65],
@@ -132,7 +132,7 @@ async_dist(Config) when is_list(Config) ->
 
 iter_max_files(suite) -> [];
 iter_max_files(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
     N = 10,
     %% Run on a different node in order to set the max ports
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index b0ac1c703c..7d5e57eb0c 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -82,7 +82,7 @@ drv_case(Config, CaseName, Command, TimeTrap) when is_list(Config),
 
 run_drv_case(Config, CaseName, Command, TimeTrap) ->
     ct:timetrap({seconds, TimeTrap}),
-    ?line DataDir = ?config(data_dir,Config),
+    ?line DataDir = proplists:get_value(data_dir,Config),
     case erl_ddll:load_driver(DataDir, CaseName) of
 	ok -> ok;
 	{error, Error} ->
diff --git a/erts/emulator/test/erts_debug_SUITE.erl b/erts/emulator/test/erts_debug_SUITE.erl
index d4814bd8f4..e757ebdb3d 100644
--- a/erts/emulator/test/erts_debug_SUITE.erl
+++ b/erts/emulator/test/erts_debug_SUITE.erl
@@ -157,7 +157,7 @@ term_type(Config) when is_list(Config) ->
 
 df(Config) when is_list(Config) ->
     P0 = pps(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = file:set_cwd(PrivDir),
 
     AllLoaded = [M || {M,_} <- code:all_loaded()],
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index 2d53cb1cd1..33728c3f5a 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -78,7 +78,7 @@ estone(suite) ->
 estone(doc) ->
     ["EStone Test"];
 estone(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
+    ?line DataDir = proplists:get_value(data_dir,Config),
     ?line Mhz=get_cpu_speed(os:type(),DataDir),
     ?line L = ?MODULE:macro(?MODULE:micros(),DataDir),
     ?line {Total, Stones} = sum_micros(L, 0, 0),
@@ -87,7 +87,7 @@ estone(Config) when is_list(Config) ->
 	   integer_to_list(Stones) ++ " ESTONES"}.
 
 estone_bench(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     L = ?MODULE:macro(?MODULE:micros(),DataDir),
     [ct_event:notify(
        #event{name = benchmark_data, 
diff --git a/erts/emulator/test/float_SUITE.erl b/erts/emulator/test/float_SUITE.erl
index 9eb4456de0..67e14e015e 100644
--- a/erts/emulator/test/float_SUITE.erl
+++ b/erts/emulator/test/float_SUITE.erl
@@ -81,12 +81,12 @@ fpe(Config) when is_list(Config) ->
 -define(ERTS_FP_THREAD_TEST, 1).
 
 fp_drv(Config) when is_list(Config) ->
-    fp_drv_test(?ERTS_FP_CONTROL_TEST, ?config(data_dir, Config)).
+    fp_drv_test(?ERTS_FP_CONTROL_TEST, proplists:get_value(data_dir, Config)).
 
 fp_drv_thread(Config) when is_list(Config) ->
     %% Run in a separate node since it used to crash the emulator...
     ?line Parent = self(),
-    ?line DrvDir = ?config(data_dir, Config),
+    ?line DrvDir = proplists:get_value(data_dir, Config),
     ?line {ok,Node} = start_node(Config),
     ?line Tester = spawn_link(Node,
 			      fun () ->
@@ -278,7 +278,7 @@ start_node(Config) when is_list(Config) ->
     ?line Pa = filename:dirname(code:which(?MODULE)),
     ?line Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
+			      ++ atom_to_list(proplists:get_value(testcase, Config))
 			      ++ "-"
 			      ++ integer_to_list(erlang:system_time(seconds))
 			      ++ "-"
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index 9020c7f7b9..f89cc623c4 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -326,7 +326,7 @@ ordering(Config) when is_list(Config) ->
 
     %% Create a port and ref.
 
-    ?line Path = ?config(priv_dir, Config),
+    ?line Path = proplists:get_value(priv_dir, Config),
     ?line AFile = filename:join(Path, "vanilla_file"),
     ?line P = open_port(AFile, [out]),
     ?line R = make_ref(),
@@ -400,7 +400,7 @@ fun_to_port(Config) when is_list(Config) ->
     ok.
 
 fun_to_port(Config, IoList) ->
-    Path = ?config(priv_dir, Config),
+    Path = proplists:get_value(priv_dir, Config),
     AFile = filename:join(Path, "vanilla_file"),
     Port = open_port(AFile, [out]),
     case catch port_command(Port, IoList) of
diff --git a/erts/emulator/test/ignore_cores.erl b/erts/emulator/test/ignore_cores.erl
index e40b91392c..4af5efe834 100644
--- a/erts/emulator/test/ignore_cores.erl
+++ b/erts/emulator/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/erts/emulator/test/message_queue_data_SUITE.erl b/erts/emulator/test/message_queue_data_SUITE.erl
index 36a8311cd2..bbf6b7bb2c 100644
--- a/erts/emulator/test/message_queue_data_SUITE.erl
+++ b/erts/emulator/test/message_queue_data_SUITE.erl
@@ -202,7 +202,7 @@ start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
diff --git a/erts/emulator/test/module_info_SUITE.erl b/erts/emulator/test/module_info_SUITE.erl
index 9f07ff9c0c..f3738c4023 100644
--- a/erts/emulator/test/module_info_SUITE.erl
+++ b/erts/emulator/test/module_info_SUITE.erl
@@ -72,7 +72,7 @@ functions(Config) when is_list(Config) ->
 
 %% Test that deleted modules cause badarg
 deleted(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "module_info_test"),
     {ok,module_info_test,Code} = compile:file(File, [binary]),
     {module,module_info_test} = erlang:load_module(module_info_test, Code),
diff --git a/erts/emulator/test/monitor_SUITE.erl b/erts/emulator/test/monitor_SUITE.erl
index 05dfc34ed7..d37b76ec20 100644
--- a/erts/emulator/test/monitor_SUITE.erl
+++ b/erts/emulator/test/monitor_SUITE.erl
@@ -1014,7 +1014,7 @@ start_node(Config) ->
     start_node(Config, "").
 
 start_node(Config, Args) ->
-    TestCase = ?config(testcase, Config),
+    TestCase = proplists:get_value(testcase, Config),
     PA = filename:dirname(code:which(?MODULE)),
     ESTime = erlang:monotonic_time(1) + erlang:time_offset(1),
     Unique = erlang:unique_integer([positive]),
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl
index 9f0c3bdad0..a84ca0be56 100644
--- a/erts/emulator/test/mtx_SUITE.erl
+++ b/erts/emulator/test/mtx_SUITE.erl
@@ -78,7 +78,7 @@ all() ->
      hammer_sched_freqread_tryrwlock].
 
 init_per_suite(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Lib = filename:join([DataDir, atom_to_list(?MODULE)]),
     case {erlang:load_nif(Lib, none),erlang:system_info(threads)} of
 	{{error,_},false} ->
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index ff54006643..6a309b8b7f 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -101,7 +101,7 @@ reload(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "nif_mod"),
     ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
     ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
@@ -137,7 +137,7 @@ upgrade(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "nif_mod"),
     ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
     ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
@@ -656,7 +656,7 @@ resource_takeover(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "nif_mod"),
     ?line {ok,nif_mod,ModBin} = compile:file(File, [binary,return_errors]),
     ?line {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
@@ -1036,7 +1036,7 @@ threading(Config) when is_list(Config) ->
     end.
 
 threading_do(Config) ->
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "tester"),
     ?line {ok,tester,ModBin} = compile:file(File, [binary,return_errors]),
     ?line {module,tester} = erlang:load_module(tester,ModBin),
@@ -1330,7 +1330,7 @@ neg(Config) when is_list(Config) ->
     ?line {'EXIT',{badarg,_}} = (catch erlang:load_nif(badarg, 0)),
     ?line {error,{load_failed,_}} = erlang:load_nif("pink_unicorn", 0),
     
-    ?line Data = ?config(data_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "nif_mod"),
     ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
     ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
@@ -1384,7 +1384,7 @@ ensure_lib_loaded(Config) ->
 ensure_lib_loaded(Config, Ver) ->
     ?line case lib_version() of
 	      undefined ->
-		  ?line Path = ?config(data_dir, Config),    
+		  ?line Path = proplists:get_value(data_dir, Config),
 		  ?line Lib = "nif_SUITE." ++ integer_to_list(Ver),
 		  ?line ok = erlang:load_nif(filename:join(Path,Lib), []);
 	      Ver when is_integer(Ver) ->
diff --git a/erts/emulator/test/nif_SUITE_data/nif_mod.erl b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
index aa3c90fe9d..e12db72bea 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_mod.erl
+++ b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
@@ -33,7 +33,7 @@ load_nif_lib(Config, Ver) ->
     load_nif_lib(Config, Ver, []).
 
 load_nif_lib(Config, Ver, LoadInfo) ->
-    ?line Path = ?config(data_dir, Config),    
+    ?line Path = proplists:get_value(data_dir, Config),
     erlang:load_nif(filename:join(Path,libname(Ver)), LoadInfo).
 
 libname(no_init) -> libname(3);
diff --git a/erts/emulator/test/nif_SUITE_data/tester.erl b/erts/emulator/test/nif_SUITE_data/tester.erl
index 32b9ef1826..388b5cab61 100644
--- a/erts/emulator/test/nif_SUITE_data/tester.erl
+++ b/erts/emulator/test/nif_SUITE_data/tester.erl
@@ -6,7 +6,7 @@
 
 
 load_nif_lib(Config, LibName) ->
-    ?line Path = ?config(data_dir, Config),    
+    ?line Path = proplists:get_value(data_dir, Config),
     erlang:load_nif(filename:join(Path,LibName), []).
 
 run() ->
diff --git a/erts/emulator/test/old_scheduler_SUITE.erl b/erts/emulator/test/old_scheduler_SUITE.erl
index 5fef53a564..612487cd35 100644
--- a/erts/emulator/test/old_scheduler_SUITE.erl
+++ b/erts/emulator/test/old_scheduler_SUITE.erl
@@ -69,12 +69,12 @@ init_per_testcase(_Case, Config) ->
 
 end_per_testcase(_Case, Config) ->
     erlang:system_flag(multi_scheduling, unblock),
-    Prio=?config(prio, Config),
+    Prio=proplists:get_value(prio, Config),
     process_flag(priority, Prio),
     ok.
 
 ok(Config) when is_list(Config) ->
-    case ?config(multi_scheduling, Config) of
+    case proplists:get_value(multi_scheduling, Config) of
 	blocked ->
 	    {comment,
 	     "Multi-scheduling blocked during test. This testcase was not "
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 0d8cb77161..8a52305414 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -363,7 +363,7 @@ input_only(Config) when is_list(Config) ->
 
 output_only(Config) when is_list(Config) ->
     ct:timetrap({seconds, 100}),
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
 
     %% First we test that the port program gets the data
     Filename = filename:join(Dir, "output_only_stream"),
@@ -504,8 +504,8 @@ make_dying_port(Config) when is_list(Config) ->
 port_program_with_path(suite) -> [];
 port_program_with_path(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
-    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 a copy of the port test program in a directory not
     %% included in PATH (i.e. in priv_dir), with the name 'my_port_test.exe'.
@@ -545,7 +545,7 @@ port_program_with_path(Config) when is_list(Config) ->
 %% This used to fail on Windows.
 open_input_file_port(suite) -> [];
 open_input_file_port(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     
     %% Create a file with the file driver and read it back using
     %% open_port/2.
@@ -566,7 +566,7 @@ open_input_file_port(Config) when is_list(Config) ->
 open_output_file_port(suite) -> [];
 open_output_file_port(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Create a file with open_port/2 and read it back with
     %% the file driver.
@@ -841,7 +841,7 @@ env(doc) ->
     ["Test that the 'env' option works"];
 env(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     Temp = filename:join(Priv, "env_fun.bin"),
 
     PluppVal = "dirty monkey",
@@ -975,7 +975,7 @@ cd(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
 
     Program = atom_to_list(lib:progname()),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     TestDir = filename:join(DataDir, "dir"),
     Cmd = Program ++ " -pz " ++ DataDir ++
         " -noshell -s port_test pwd -s erlang halt",
@@ -1064,7 +1064,7 @@ otp_3906(Config, OSName) ->
     case lists:keysearch('CC', 1, Variables) of
 	{value,{'CC', CC}} ->
 	    SuiteDir = filename:dirname(code:which(?MODULE)),
-	    PrivDir = ?config(priv_dir, Config),
+	    PrivDir = proplists:get_value(priv_dir, Config),
 	    Prog = otp_3906_make_prog(CC, PrivDir),
 	    {ok, Node} = test_server:start_node(otp_3906,
 						slave,
@@ -1330,7 +1330,7 @@ spawn_driver(suite) ->
 spawn_driver(doc) ->
     ["Test spawning a driver specifically"];
 spawn_driver(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
     Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
     Port ! {self(), {command, "Hello port!"}},
@@ -1365,7 +1365,7 @@ parallelism_option(suite) ->
 parallelism_option(doc) ->
     ["Test parallelism option of open_port"];
 parallelism_option(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line ok = load_driver(Path, "echo_drv"),
     ?line Port = erlang:open_port({spawn_driver, "echo_drv"},
 				  [{parallelism, true}]),
@@ -1400,7 +1400,7 @@ spawn_executable(suite) ->
 spawn_executable(doc) ->
     ["Test spawning an executable specifically"];
 spawn_executable(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     EchoArgs1 = filename:join([DataDir,"echo_args"]),
     ExactFile1 = filename:nativename(os:find_executable(EchoArgs1)),
     [ExactFile1] = run_echo_args(DataDir,[]),
@@ -1427,8 +1427,8 @@ spawn_executable(Config) when is_list(Config) ->
     [ExactFile1,"hello world","dlrow olleh"] =
 	run_echo_args_2(unicode:characters_to_binary("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\"")),
 
-    PrivDir = ?config(priv_dir, Config),
-    SpaceDir =filename:join([PrivDir,"With Spaces"]),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SpaceDir = filename:join([PrivDir,"With Spaces"]),
     file:make_dir(SpaceDir),
     Executable = filename:basename(ExactFile1),
     file:copy(ExactFile1,filename:join([SpaceDir,Executable])),
@@ -1640,7 +1640,7 @@ mix_up_ports(suite) ->
 mix_up_ports(doc) ->
     ["Test that the emulator does not mix up ports when the port table wraps"];
 mix_up_ports(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
     Port = erlang:open_port({spawn, "echo_drv"}, []),
     Port ! {self(), {command, "Hello port!"}},
@@ -1686,7 +1686,7 @@ otp_5112(doc) ->
     ["Test that link to connected process is taken away when port calls",
      "driver_exit() also when the port index has wrapped"];
 otp_5112(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
     Port = otp_5112_get_wrapped_port(),
     io:format("Max ports: ~p~n",[max_ports()]),
@@ -1732,7 +1732,7 @@ otp_5119(suite) ->
 otp_5119(doc) ->
     ["Test that port index is not unnecessarily wrapped"];
 otp_5119(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
     PI1 = port_ix(otp_5119_fill_empty_port_tab([])),
     Port2 = erlang:open_port({spawn, "exit_drv"}, []),
@@ -1776,7 +1776,7 @@ port_ix(Port) when is_port(Port) ->
 otp_6224(doc) -> ["Check that port command failure doesn't crash the emulator"];
 otp_6224(suite) -> [];
 otp_6224(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "failure_drv"),
     Go = make_ref(),
     Failer = spawn(fun () ->
@@ -2223,13 +2223,13 @@ fun_spawn(Fun, Args) ->
     spawn_link(erlang, apply, [Fun, Args]).
 
 port_test(Config) when is_list(Config) ->
-    filename:join(?config(data_dir, Config), "port_test").
+    filename:join(proplists:get_value(data_dir, Config), "port_test").
 
 
 ports(doc) -> "Test that erlang:ports/0 returns a consistent snapshot of ports";
 ports(suite) -> [];
 ports(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
 
     receive after 1000 -> ok end, % Wait for other ports to stabilize
@@ -2339,7 +2339,7 @@ close_deaf_port(doc) -> ["Send data to port program that does not read it, then
 close_deaf_port(suite) -> [];
 close_deaf_port(Config) when is_list(Config) ->
     ct:timetrap({minutes, 2}),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     DeadPort = os:find_executable("dead_port", DataDir),
     Port = open_port({spawn,DeadPort++" 60"},[]),
     erlang:port_command(Port,"Hello, can you hear me!?!?"),
@@ -2368,7 +2368,7 @@ close_deaf_port_1(N, Cmd) ->
 %% Hammer from multiple processes a while
 %% and then abrubtly close the port (OTP-12208).
 port_setget_data(Config) when is_list(Config) ->
-    ok = load_driver(?config(data_dir, Config), "echo_drv"),
+    ok = load_driver(proplists:get_value(data_dir, Config), "echo_drv"),
     Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
 
     NSched = erlang:system_info(schedulers_online),
diff --git a/erts/emulator/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl
index bdadfc48ac..9b794be415 100644
--- a/erts/emulator/test/port_bif_SUITE.erl
+++ b/erts/emulator/test/port_bif_SUITE.erl
@@ -76,7 +76,7 @@ do_command(P, Data) ->
 
 %% port_command/2: badarg 1st arg
 command_e_1(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -98,7 +98,7 @@ do_command_e_1(Program) ->
 
 %% port_command/2: badarg 2nd arg
 command_e_2(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -120,7 +120,7 @@ do_command_e_2(Program) ->
 
 %% port_command/2: Posix signals trapped
 command_e_3(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -139,7 +139,7 @@ command_e_3(Config) when is_list(Config) ->
 
 %% port_command/2: Posix exit signals not trapped
 command_e_4(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -236,7 +236,7 @@ do_port_info_os_pid() ->
     ok.
 
 port_info_race(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
     Top = self(),
     P1 = open_port({spawn,Program}, [{packet,1}]),
@@ -428,7 +428,7 @@ echo(P, Size) ->
     Packet = erlang:port_control(P, $e, [unaligned_sub_bin(Bin)]).
 
 load_control_drv(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(DataDir, "control_drv").
 
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 6c733195b7..ff55a0102f 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -118,7 +118,7 @@ init_per_suite(Config) ->
     [{started_apps, A}|Config].
 
 end_per_suite(Config) ->
-    As = ?config(started_apps, Config),
+    As = proplists:get_value(started_apps, Config),
     lists:foreach(fun (A) -> application:stop(A) end, As),
     catch erts_debug:set_internal_state(available_internal_state, false),
     Config.
@@ -2495,7 +2495,7 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
+			      ++ atom_to_list(proplists:get_value(testcase, Config))
 			      ++ "-"
 			      ++ integer_to_list(erlang:system_time(seconds))
 			      ++ "-"
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 38f8dcc8d4..dbbf1c43ac 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -1175,7 +1175,7 @@ dirty_scheduler_exit_test(Config) ->
     {ok, Node} = start_node(Config, "+SDio 1"),
     [ok] = mcall(Node,
                  [fun() ->
-                          Path = ?config(data_dir, Config),
+                          Path = proplists:get_value(data_dir, Config),
                           Lib = atom_to_list(?MODULE),
                           ok = erlang:load_nif(filename:join(Path,Lib), []),
                           ok = test_dirty_scheduler_exit()
@@ -1802,7 +1802,7 @@ restore_erl_rel_flags(OldValue) ->
 ok(too_slow, _Config) ->
     {comment, "Too slow system to do any actual testing..."};
 ok(_Res, Config) ->
-    ?config(ok_res, Config).
+    proplists:get_value(ok_res, Config).
 
 chk_result(too_slow,
 	   _LWorkers,
@@ -2227,7 +2227,7 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
diff --git a/erts/emulator/test/send_term_SUITE.erl b/erts/emulator/test/send_term_SUITE.erl
index 1915b44b4b..ed70d14a1b 100644
--- a/erts/emulator/test/send_term_SUITE.erl
+++ b/erts/emulator/test/send_term_SUITE.erl
@@ -65,7 +65,7 @@ basic(Config) when is_list(Config) ->
     ?line {Self,Child} = receive_any(),
 
     %% ERL_DRV_EXT2TERM
-    ?line ExpectExt2Term = expected_ext2term_drv(?config(data_dir, Config)),
+    ?line ExpectExt2Term = expected_ext2term_drv(proplists:get_value(data_dir, Config)),
     ?line ExpectExt2Term = term(P, 5),
 
     %% ERL_DRV_INT, ERL_DRV_UINT
@@ -180,7 +180,7 @@ chk_temp_alloc() ->
 
 %% Start/stop drivers.
 start_driver(Config, Name) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(Path, Name),
     open_port({spawn, Name}, []).
diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index e6ec79141b..0784b1df36 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -503,7 +503,7 @@ repeat(Fun, N) when is_integer(N)  ->
 
 start_node(Config) ->
     Name = list_to_atom(atom_to_list(?MODULE)
-			++ "-" ++ atom_to_list(?config(testcase, Config))
+			++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-" ++ integer_to_list(erlang:system_time(seconds))
 			++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
     Pa = filename:dirname(code:which(?MODULE)),
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
index 3c616b4304..9b0db358f1 100644
--- a/erts/emulator/test/smoke_test_SUITE.erl
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -150,7 +150,7 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 	      ++ "-"
-	      ++ atom_to_list(?config(testcase, Config))
+	      ++ atom_to_list(proplists:get_value(testcase, Config))
 	      ++ "-"
 	      ++ integer_to_list(erlang:system_time(seconds))
 	      ++ "-"
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index a7db06f2c5..a740cf3622 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -537,7 +537,7 @@ start_node(Config, Envs) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
                         ++ "-"
-                        ++ atom_to_list(?config(testcase, Config))
+                        ++ atom_to_list(proplists:get_value(testcase, Config))
                         ++ "-"
                         ++ integer_to_list(erlang:system_time(seconds))
                         ++ "-"
diff --git a/erts/emulator/test/system_profile_SUITE.erl b/erts/emulator/test/system_profile_SUITE.erl
index 0becf88f7a..7abce1e715 100644
--- a/erts/emulator/test/system_profile_SUITE.erl
+++ b/erts/emulator/test/system_profile_SUITE.erl
@@ -392,7 +392,7 @@ ring_loop(RelayTo) ->
 %% API
 
 echo(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:load_driver(Path, echo_drv),
     Pid = spawn_link(?MODULE, port_echo_start, []),
     Pid ! {self(), get_ports},
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index c225c4d88f..cf98247751 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -1042,7 +1042,7 @@ start_node(Config) ->
     start_node(Config, "").
 
 start_node(Config, Args) ->
-    TestCase = ?config(testcase, Config),
+    TestCase = proplists:get_value(testcase, Config),
     PA = filename:dirname(code:which(?MODULE)),
     ESTime = erlang:monotonic_time(1) + erlang:time_offset(1),
     Unique = erlang:unique_integer([positive]),
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 5762fd558b..44d631cfa9 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -507,7 +507,7 @@ system_monitor_long_schedule(suite) ->
 system_monitor_long_schedule(doc) ->
     ["Tests erlang:system_monitor(Pid, [{long_schedule,Time}])"];
 system_monitor_long_schedule(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     case (catch load_driver(Path, slow_drv)) of
 	ok ->
diff --git a/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl
index 59a819fe2a..907026bf03 100644
--- a/erts/emulator/test/trace_call_time_SUITE.erl
+++ b/erts/emulator/test/trace_call_time_SUITE.erl
@@ -548,7 +548,7 @@ collect_all_info([]) -> [].
 %% Local helpers
 
 load_nif(Config) ->
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     ?line ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
 
 
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 2b142596a3..a579fd7b4e 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -738,8 +738,8 @@ info_test() ->
     ok.
 
 delete_test(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
+    ?line Priv = proplists:get_value(priv_dir, Config),
+    ?line Data = proplists:get_value(data_dir, Config),
     ?line File = filename:join(Data, "trace_local_dummy"),
     ?line {ok,trace_local_dummy} = c:c(File, [{outdir,Priv}]),
     ?line code:purge(trace_local_dummy),
diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl
index f61e11595f..4ddcbf8f6b 100644
--- a/erts/emulator/test/trace_nif_SUITE.erl
+++ b/erts/emulator/test/trace_nif_SUITE.erl
@@ -284,7 +284,7 @@ nif_process() ->
     nif_process().    
 
 load_nif(Config) ->    
-    ?line Path = ?config(data_dir, Config),
+    ?line Path = proplists:get_value(data_dir, Config),
     
     ?line ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
 
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index 18a475f04b..a38fced7cb 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -610,7 +610,7 @@ trace_pid(Pid, On, Flags0) ->
     Res.
 
 start_tracer(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, echo_drv),
     Self = self(),
     put(tracer, fun_spawn(fun() -> tracer(Self) end)),
diff --git a/erts/emulator/test/tuple_SUITE.erl b/erts/emulator/test/tuple_SUITE.erl
index fb44be3145..d59d7d12d3 100644
--- a/erts/emulator/test/tuple_SUITE.erl
+++ b/erts/emulator/test/tuple_SUITE.erl
@@ -64,7 +64,7 @@ init_per_suite(Config) ->
     [{started_apps, A}|Config].
 
 end_per_suite(Config) ->
-    As = ?config(started_apps, Config),
+    As = proplists:get_value(started_apps, Config),
     lists:foreach(fun (A) -> application:stop(A) end, As),
     Config.
 
diff --git a/erts/emulator/test/unique_SUITE.erl b/erts/emulator/test/unique_SUITE.erl
index 96c327c6ce..84e5cf3222 100644
--- a/erts/emulator/test/unique_SUITE.erl
+++ b/erts/emulator/test/unique_SUITE.erl
@@ -372,7 +372,7 @@ start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
     ?line B = erlang:unique_integer([positive]),
     ?line Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
+			      ++ atom_to_list(proplists:get_value(testcase, Config))
 			      ++ "-"
 			      ++ integer_to_list(A)
 			      ++ "-"
-- 
cgit v1.2.3