aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test_server/ts_install.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-07-06 16:59:47 +0200
committerSiri Hansen <[email protected]>2017-09-15 17:07:50 +0200
commit09e2288b7a42345ea76e5e23ad93346c63efb06d (patch)
tree80a0814a8156544348979fcb26653fce01f6734c /lib/common_test/test_server/ts_install.erl
parent532ab69fce9b7d1dc6974632ed8d17fdab68bd1a (diff)
downloadotp-09e2288b7a42345ea76e5e23ad93346c63efb06d.tar.gz
otp-09e2288b7a42345ea76e5e23ad93346c63efb06d.tar.bz2
otp-09e2288b7a42345ea76e5e23ad93346c63efb06d.zip
common_test: Do not use deprecated functions in string(3)
Diffstat (limited to 'lib/common_test/test_server/ts_install.erl')
-rw-r--r--lib/common_test/test_server/ts_install.erl16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index c4e0223ac7..eb20e62128 100644
--- a/lib/common_test/test_server/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
@@ -115,7 +115,7 @@ get_vars(_, _, _, _) ->
config_flags() ->
case os:getenv("CONFIG_FLAGS") of
false -> [];
- CF -> string:tokens(CF, " \t\n")
+ CF -> string:lexemes(CF, " \t\n")
end.
unix_autoconf(XConf) ->
@@ -127,7 +127,7 @@ unix_autoconf(XConf) ->
Threads = [" --enable-shlib-thread-safety" ||
erlang:system_info(threads) /= false],
Debug = [" --enable-debug-mode" ||
- string:str(erlang:system_info(system_version),"debug") > 0],
+ string:find(erlang:system_info(system_version),"debug") =/= nomatch],
MXX_Build = [Y || Y <- config_flags(),
Y == "--enable-m64-build"
orelse Y == "--enable-m32-build"],
@@ -159,10 +159,8 @@ assign_vars([]) ->
assign_vars([{VAR,FlagsStr} | VARs]) ->
[{VAR,assign_vars(FlagsStr)} | assign_vars(VARs)];
assign_vars(FlagsStr) ->
- Flags = [assign_all_vars(Str,[]) || Str <- string:tokens(FlagsStr, [$ ])],
- string:strip(lists:flatten(lists:map(fun(Flag) ->
- Flag ++ " "
- end, Flags)), right).
+ Flags = [assign_all_vars(Str,[]) || Str <- string:lexemes(FlagsStr, [$\s])],
+ lists:flatten(lists:join(" ", Flags)).
assign_all_vars([$$ | Rest], FlagSoFar) ->
{VarName,Rest1} = get_var_name(Rest, []),
@@ -292,7 +290,7 @@ add_vars(Vars0, Opts0) ->
get_testcase_callback() ->
case os:getenv("TS_TESTCASE_CALLBACK") of
ModFunc when is_list(ModFunc), ModFunc /= "" ->
- case string:tokens(ModFunc, " ") of
+ case string:lexemes(ModFunc, " ") of
[_Mod,_Func] -> ModFunc;
_ -> ""
end;
@@ -434,8 +432,8 @@ bind_type() ->
debug() ->
- case string:str(erlang:system_info(system_version), "debug") of
- 0 -> "";
+ case string:find(erlang:system_info(system_version), "debug") of
+ nomatch -> "";
_ -> "/Debug"
end.