diff options
| author | Rickard Green <[email protected]> | 2017-03-27 15:34:15 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-04-05 14:36:44 +0200 |
| commit | 671d690debf653a6b1e86c3e7880b9c5640b1324 (patch) | |
| tree | 2d3184c6e518d4fc51643cfa6b6ee4bda7b4a537 | |
| parent | c75b909e0e1ac355e1eb76c99af7ed72e72f13a4 (diff) | |
| download | otp-671d690debf653a6b1e86c3e7880b9c5640b1324.tar.gz otp-671d690debf653a6b1e86c3e7880b9c5640b1324.tar.bz2 otp-671d690debf653a6b1e86c3e7880b9c5640b1324.zip | |
Adjust for incompatibility between PCRE 8.40 and perl 5.22.1
| -rw-r--r-- | lib/stdlib/test/re_testoutput1_replacement_test.erl | 12 | ||||
| -rw-r--r-- | lib/stdlib/test/re_testoutput1_split_test.erl | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl index 199674bc62..df46305ce1 100644 --- a/lib/stdlib/test/re_testoutput1_replacement_test.erl +++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl @@ -19748,16 +19748,16 @@ run49() -> <<"aJcbatLdoGHtuOHxJ">> = iolist_to_binary(re:replace("aba","(?>.*?a)(?<=ba)","Jc&tLdoGHt\\1uOHxJ",[global])), <<"jnJTr">> = iolist_to_binary(re:replace("aba","(?:.*?a)(?<=ba)","jnJTr",[])), <<"jnJTr">> = iolist_to_binary(re:replace("aba","(?:.*?a)(?<=ba)","jnJTr",[global])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","SS\\1\\1oE\\1g",[])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","SS\\1\\1oE\\1g",[global])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","OdJuWtvQ",[dotall])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","OdJuWtvQ",[dotall, + <<"aSSoEg">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","SS\\1\\1oE\\1g",[])), + <<"aSSoEg">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","SS\\1\\1oE\\1g",[global])), + <<"aOdJuWtvQ">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","OdJuWtvQ",[dotall])), + <<"aOdJuWtvQ">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","OdJuWtvQ",[dotall, global])), <<"aab">> = iolist_to_binary(re:replace("aab","^a(*PRUNE)b","u\\1oO\\1B\\1\\1",[dotall])), <<"aab">> = iolist_to_binary(re:replace("aab","^a(*PRUNE)b","u\\1oO\\1B\\1\\1",[dotall, global])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1UtmYVc\\1&mq\\1fPDm",[])), - <<"aab">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1UtmYVc\\1&mq\\1fPDm",[global])), + <<"aUtmYVcabmqfPDm">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1UtmYVc\\1&mq\\1fPDm",[])), + <<"aUtmYVcabmqfPDm">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1UtmYVc\\1&mq\\1fPDm",[global])), <<"amg">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","m\\1g",[dotall])), <<"amg">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","m\\1g",[dotall, global])), diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl index 0a1879eb35..4022f9b195 100644 --- a/lib/stdlib/test/re_testoutput1_split_test.erl +++ b/lib/stdlib/test/re_testoutput1_split_test.erl @@ -31558,26 +31558,26 @@ run49() -> <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[{parts, 2}]))), <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[trim]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[{parts, + <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[trim]))), + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[{parts, 2}]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall, + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[]))), + <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall, trim]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall, + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall, {parts, 2}]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall]))), + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall]))), <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall, trim]))), <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall, {parts, 2}]))), <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[trim]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[{parts, + <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[trim]))), + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[{parts, 2}]))), - <<"aab">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[]))), + <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[]))), <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall, trim]))), <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall, |