diff options
author | Lukas Larsson <[email protected]> | 2017-09-12 10:01:15 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2017-09-12 10:01:15 +0200 |
commit | c22e19bf3b5f735fb9007c07cfd6251a61d3d492 (patch) | |
tree | 3b2f58b9e860a86d11ba9869f992e052893fb115 /lib/asn1/test | |
parent | 39c3d2ed3f6f7c15e7f726f0cb444d2b79775146 (diff) | |
parent | 18fb1a9230578456f3d03b4136ed296407bdf53c (diff) | |
download | otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.gz otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.bz2 otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/asn1/test')
-rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/asn1/test/testUniqueObjectSets.erl | 2 | ||||
-rw-r--r-- | lib/asn1/test/test_modified_x420.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index c61cecca4c..b98a704e28 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -266,7 +266,7 @@ replace_path(PathA, PathB) -> true = code:add_patha(PathB). join(Rule, Opts) -> - string:join([atom_to_list(Rule)|lists:map(fun atom_to_list/1, Opts)], "_"). + lists:join("_", [atom_to_list(Rule)|lists:map(fun atom_to_list/1, Opts)]). %%------------------------------------------------------------------------------ %% Test cases diff --git a/lib/asn1/test/testUniqueObjectSets.erl b/lib/asn1/test/testUniqueObjectSets.erl index 476d190651..cabdb44a0c 100644 --- a/lib/asn1/test/testUniqueObjectSets.erl +++ b/lib/asn1/test/testUniqueObjectSets.erl @@ -60,7 +60,7 @@ main(CaseDir, Rule, Opts) -> Objs = [gen_obj(I) || {I,_,_} <- D1], DupObjs = [gen_dup_obj(I, T) || {I,T,_} <- D1], DupObjRefs0 = [gen_dup_obj_refs(I) || {I,_,_} <- D1], - DupObjRefs = string:join(DupObjRefs0, " |\n"), + DupObjRefs = lists:join(" |\n", DupObjRefs0), Asn1Spec = 'UniqueObjectSets', A = ["UniqueObjectSets DEFINITIONS AUTOMATIC TAGS ::=\n", "BEGIN\n\n", diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl index 6cd9e0e33b..15f7c70978 100644 --- a/lib/asn1/test/test_modified_x420.erl +++ b/lib/asn1/test/test_modified_x420.erl @@ -38,7 +38,7 @@ read_pem(File) -> extract_base64(Binary) -> - extract_base64_lines(string:tokens(binary_to_list(Binary), "\n")). + extract_base64_lines(string:lexemes(binary_to_list(Binary), "\n")). extract_base64_lines(["-----BEGIN"++_ | Lines]) -> take_base64_lines(Lines, _Acc = []); |