diff options
| author | Rickard Green <[email protected]> | 2019-06-18 22:24:47 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-06-18 22:24:47 +0200 |
| commit | 272ee2d47e7c648a1c5987429053d7a3ee208716 (patch) | |
| tree | b1a27655cd91d517e624c4d1a32089d8ddf138b1 /lib/stdlib/test/re_SUITE.erl | |
| parent | 4319a7f8bc93388ec540e954eb9bb73ea1eec4ef (diff) | |
| parent | c1588491158f8e59b92936381e606b173488d17a (diff) | |
| download | otp-272ee2d47e7c648a1c5987429053d7a3ee208716.tar.gz otp-272ee2d47e7c648a1c5987429053d7a3ee208716.tar.bz2 otp-272ee2d47e7c648a1c5987429053d7a3ee208716.zip | |
Merge branch 'rickard/re-global-unicode-validation/OTP-15831/ERL-876' into rickard/re-unicode-validation/OTP-15831/OTP-15836/ERL-876
* rickard/re-global-unicode-validation/OTP-15831/ERL-876:
Update runtime dependency from stdlib to erts
Only validate subject once when global is used in re:run()
Add global_unicode_validation() test
Diffstat (limited to 'lib/stdlib/test/re_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/re_SUITE.erl | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl index c9ef9da990..f026159b47 100644 --- a/lib/stdlib/test/re_SUITE.erl +++ b/lib/stdlib/test/re_SUITE.erl @@ -28,7 +28,7 @@ pcre_compile_workspace_overflow/1,re_infinite_loop/1, re_backwards_accented/1,opt_dupnames/1,opt_all_names/1,inspect/1, opt_no_start_optimize/1,opt_never_utf/1,opt_ucp/1, - match_limit/1,sub_binaries/1,copt/1]). + match_limit/1,sub_binaries/1,copt/1,global_unicode_validation/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("kernel/include/file.hrl"). @@ -45,7 +45,7 @@ all() -> pcre_compile_workspace_overflow, re_infinite_loop, re_backwards_accented, opt_dupnames, opt_all_names, inspect, opt_no_start_optimize,opt_never_utf,opt_ucp, - match_limit, sub_binaries, re_version]. + match_limit, sub_binaries, re_version, global_unicode_validation]. groups() -> []. @@ -200,7 +200,31 @@ re_version(_Config) -> {match,[Version]} = re:run(Version,"^[0-9]\\.[0-9]{2} 20[0-9]{2}-[0-9]{2}-[0-9]{2}",[{capture,all,binary}]), ok. +global_unicode_validation(Config) when is_list(Config) -> + %% Test that unicode validation of the subject is not done + %% for every match found... + Bin = binary:copy(<<"abc\n">>,100000), + {TimeAscii, _} = take_time(fun () -> + re:run(Bin, <<"b">>, [global]) + end), + {TimeUnicode, _} = take_time(fun () -> + re:run(Bin, <<"b">>, [unicode,global]) + end), + if TimeAscii == 0; TimeUnicode == 0 -> + {comment, "Not good enough resolution to compare results"}; + true -> + %% The time the operations takes should be in the + %% same order of magnitude. If validation of the + %% whole subject occurs for every match, the unicode + %% variant will take way longer time... + true = TimeUnicode div TimeAscii < 10 + end. +take_time(Fun) -> + Start = erlang:monotonic_time(nanosecond), + Res = Fun(), + End = erlang:monotonic_time(nanosecond), + {End-Start, Res}. %% Test compile options given directly to run. combined_options(Config) when is_list(Config) -> |