diff options
author | Lukas Larsson <[email protected]> | 2017-09-12 10:00:47 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2017-09-12 10:00:47 +0200 |
commit | 18fb1a9230578456f3d03b4136ed296407bdf53c (patch) | |
tree | 4edfa1ba190f4ebbf3066cd394d9439bb7a62486 /lib/asn1/test/test_modified_x420.erl | |
parent | 54d87b64ba447371fb51f1ad7e773317e684843f (diff) | |
parent | bcfa4564df41ad5806a4848dcb3be31fbfea6a9e (diff) | |
download | otp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.gz otp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.bz2 otp-18fb1a9230578456f3d03b4136ed296407bdf53c.zip |
Merge branch 'lukas/ct/ts_abort_on_compilation_fail' into maint
* lukas/ct/ts_abort_on_compilation_fail:
erts: Fix leaking of fds in iovec_SUITE
ts: Don't test apps that are not available
asn1: Fix test suite deprecated functions
ct: ts:run now abort the test run on compilation failure
Diffstat (limited to 'lib/asn1/test/test_modified_x420.erl')
-rw-r--r-- | lib/asn1/test/test_modified_x420.erl | 2 |
1 files changed, 1 insertions, 1 deletions
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 = []); |