From 39e4bd0487bc37d2a9c570d796b4dc47a56fdea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Mon, 21 Mar 2016 18:14:14 +0100 Subject: Replace ?config() macro with proplists:get_value() --- lib/erl_interface/test/ei_accept_SUITE.erl | 2 +- lib/erl_interface/test/ei_connect_SUITE.erl | 2 +- lib/erl_interface/test/ei_tmo_SUITE.erl | 4 ++-- lib/erl_interface/test/erl_eterm_SUITE.erl | 8 ++++---- lib/erl_interface/test/port_call_SUITE.erl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/erl_interface/test') diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl index b34dbd2728..aca051be14 100644 --- a/lib/erl_interface/test/ei_accept_SUITE.erl +++ b/lib/erl_interface/test/ei_accept_SUITE.erl @@ -75,7 +75,7 @@ ei_accept(Config) when is_list(Config) -> ok. ei_threaded_accept(Config) when is_list(Config) -> - Einode = filename:join(?config(data_dir, Config), "eiaccnode"), + Einode = filename:join(proplists:get_value(data_dir, Config), "eiaccnode"), N = 1, % 3, Host = atom_to_list(node()), Port = 6767, diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl index c4b19c6523..54065b7e6a 100644 --- a/lib/erl_interface/test/ei_connect_SUITE.erl +++ b/lib/erl_interface/test/ei_connect_SUITE.erl @@ -102,7 +102,7 @@ ei_reg_send(Config) when is_list(Config) -> ok. ei_threaded_send(Config) when is_list(Config) -> - Einode = filename:join(?config(data_dir, Config), "einode"), + Einode = filename:join(proplists:get_value(data_dir, Config), "einode"), N = 15, Host = atom_to_list(node()), TestServerPid = self(), diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl index 738f69cdbe..995a407fa2 100644 --- a/lib/erl_interface/test/ei_tmo_SUITE.erl +++ b/lib/erl_interface/test/ei_tmo_SUITE.erl @@ -109,7 +109,7 @@ ei_send_tmo(suite) -> ei_send_tmo(Config) when is_list(Config) -> %dbg:tracer(), %dbg:p(self()), - VxSim = ?config(vxsim, Config), + VxSim = proplists:get_value(vxsim, Config), register(ei_send_tmo_1,self()), do_one_send(Config,self(),c_node_send_tmo_1), do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2), @@ -211,7 +211,7 @@ ei_connect_tmo(suite) -> ei_connect_tmo(Config) when is_list(Config) -> %dbg:tracer(), %dbg:p(self()), - VxSim = ?config(vxsim, Config), + VxSim = proplists:get_value(vxsim, Config), DummyNode = make_and_check_dummy(), P = runner:start(?connect_tmo), runner:send_term(P,{c_nod_connect_tmo_1, diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl index 666c2e12bf..8595afd224 100644 --- a/lib/erl_interface/test/erl_eterm_SUITE.erl +++ b/lib/erl_interface/test/erl_eterm_SUITE.erl @@ -162,9 +162,9 @@ round_trip_conversion(Config) when is_list(Config) -> decode_terms(suite) -> []; decode_terms(Config) when is_list(Config) -> - Dummy1 = list_to_atom(filename:join(?config(priv_dir, Config), + Dummy1 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config), dummy_file1)), - Dummy2 = list_to_atom(filename:join(?config(priv_dir, Config), + Dummy2 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config), dummy_file2)), Port1 = open_port(Dummy1, [out]), Port2 = open_port(Dummy2, [out]), @@ -1023,7 +1023,7 @@ call_erl_function(Port, Term) -> end. print_term(Config) when is_list(Config) -> - filename:join(?config(data_dir, Config), "print_term"). + filename:join(proplists:get_value(data_dir, Config), "print_term"). @@ -1035,7 +1035,7 @@ print_term(Config) when is_list(Config) -> cnode_1(suite) -> []; cnode_1(doc) -> "Tests involving cnode: sends a long ref from a cnode to us"; cnode_1(Config) when is_list(Config) -> - Cnode = filename:join(?config(data_dir, Config), "cnode"), + Cnode = filename:join(proplists:get_value(data_dir, Config), "cnode"), register(mip, self()), spawn_link(?MODULE, start_cnode, [Cnode]), Ref1 = get_ref(), diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl index f4c7f10bb7..c10476abff 100644 --- a/lib/erl_interface/test/port_call_SUITE.erl +++ b/lib/erl_interface/test/port_call_SUITE.erl @@ -60,7 +60,7 @@ basic(Config) when is_list(Config) -> end. do_basic(Config) -> - Path = ?config(data_dir, Config), + Path = proplists:get_value(data_dir, Config), erl_ddll:start(), -- cgit v1.2.3