diff options
| author | Rickard Green <[email protected]> | 2017-04-11 15:05:51 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-04-11 15:05:51 +0200 |
| commit | 92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9 (patch) | |
| tree | 133119634987a6eeede055d644fe2f999ea3d318 /lib/stdlib/test/run_pcre_tests.erl | |
| parent | b66834310f1d3f30a7b4d5c02753053d3f9d7ef8 (diff) | |
| parent | 6520f78d4b878ff66adcf8d25de331d8ad06dd1d (diff) | |
| download | otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.tar.gz otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.tar.bz2 otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.zip | |
Merge branch 'rickard/pcre-8.40'
OTP-14331
* rickard/pcre-8.40:
Update documentation
Update README.pcre_update.md
Stack guard for PCRE
Adjust for incompatibility between PCRE 8.40 and perl 5.22.1
Generate re replacement and split tests with perl vsn 5.22.1
Fix re_SUITE:pcre_compile_workspace_overflow/1
Skip line with lockout of modifiers in PCRE tests
Update tests for PCRE version 8.40
Update PCRE to version 8.40
Conflicts:
erts/emulator/beam/beam_debug.c
Diffstat (limited to 'lib/stdlib/test/run_pcre_tests.erl')
| -rw-r--r-- | lib/stdlib/test/run_pcre_tests.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl index b62674d6e0..205a7e4946 100644 --- a/lib/stdlib/test/run_pcre_tests.erl +++ b/lib/stdlib/test/run_pcre_tests.erl @@ -389,6 +389,9 @@ stru([]) -> []; stru([{_,<<>>}|T]) -> stru(T); +stru([{_Line,<<"< forbid ", _Rest/binary>>}|T0]) -> + %% We do not handle lockout of modifiers from the tests... + stru(T0); stru([{Line,<<Ch,Re0/binary>>}|T0]) -> {T,Re} = find_rest_re(Ch,[{Line,Re0}|T0]), {NewRe,<< Ch, Options/binary >>} = end_of_re(Ch,Re), |