diff options
author | Hans Bolinder <[email protected]> | 2017-02-22 15:28:26 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2017-02-22 15:28:26 +0100 |
commit | 38a10d18d104869ebba9af568b5566d0162c6faf (patch) | |
tree | b2f5e37b1fdd573d4165e44002dae977fb3ba120 /lib/xmerl/test/xmerl_sax_SUITE.erl | |
parent | 056f1996759a29bfb97c4394bcb23c436905e4be (diff) | |
parent | 5073a7b88aa3a8e2c84dcf6bf48adafe4e874422 (diff) | |
download | otp-38a10d18d104869ebba9af568b5566d0162c6faf.tar.gz otp-38a10d18d104869ebba9af568b5566d0162c6faf.tar.bz2 otp-38a10d18d104869ebba9af568b5566d0162c6faf.zip |
Merge branch 'maint'
* maint:
[xmerl] Remove faulty throws
[xmerl] Fix XML "well-formedness" bug i SAX parser
[xmerl] Correct bug handling multiple documents on a stream
stdlib: Improve pretty-printing of terms with maps
Conflicts:
lib/stdlib/test/io_SUITE.erl
Diffstat (limited to 'lib/xmerl/test/xmerl_sax_SUITE.erl')
-rw-r--r-- | lib/xmerl/test/xmerl_sax_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl index f5c0a783c4..7d1a70905c 100644 --- a/lib/xmerl/test/xmerl_sax_SUITE.erl +++ b/lib/xmerl/test/xmerl_sax_SUITE.erl @@ -85,17 +85,17 @@ ticket_11551(_Config) -> <a>hej</a> <?xml version=\"1.0\" encoding=\"utf-8\" ?> <a>hej</a>">>, - {ok, undefined, <<"<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream1, []), + {ok, undefined, <<"\n<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream1, []), Stream2= <<"<?xml version=\"1.0\" encoding=\"utf-8\" ?> <a>hej</a> <?xml version=\"1.0\" encoding=\"utf-8\" ?> <a>hej</a>">>, - {ok, undefined, <<"<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream2, []), + {ok, undefined, <<"\n\n\n<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream2, []), Stream3= <<"<a>hej</a> <?xml version=\"1.0\" encoding=\"utf-8\" ?> <a>hej</a>">>, - {ok, undefined, <<"<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream3, []), + {ok, undefined, <<"\n\n<?xml", _/binary>>} = xmerl_sax_parser:stream(Stream3, []), ok. |