diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:23:38 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:23:38 +0100 |
| commit | f9ca630a95e1e2adb1b225bfb69e3101678183f3 (patch) | |
| tree | f40c9b82bf851b7efdb9aaa88406747f60cb4822 /erts/test/z_SUITE.erl | |
| parent | 195be9a44f2481b9c575c8ad286f4d2278b831b3 (diff) | |
| parent | d79b413adcf4c084df30f831486ba1f1ac504c5c (diff) | |
| download | otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.gz otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.bz2 otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.zip | |
Merge branch 'egil/fix-compiler-warnings' into maint
* egil/fix-compiler-warnings:
erts: Use re instead of regexp in testsuite
erts: Remove unused code in testsuites
orber: Use modern list guard in testsuite
orber: Ignore unused variable in orber_tb.erl
xmerl: Ignore unused variable in xmerl_uri.erl
syntax_tool: Add missing type information
hipe: Suppress warnings for unused variables
hipe: Add type information to cfg_info record
tools: Use literal formatting in erl_memory.c
asn1: Remove unused variable in asn1_erl_nif.c
ei: Remove unused variable in ei_format.c
erts: Add missing prototype to DRIVER_INIT
runtime_tools: Fix signedness in trace_ip_drv.c
to_erl: Remove compiler warnings
heart: Suppress compiler warnings
erts: Remove compiler warnings in inet_gethost.c
erts: Remove dead code in inet_gethost.c
erts: Remove dead code
Diffstat (limited to 'erts/test/z_SUITE.erl')
| -rw-r--r-- | erts/test/z_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl index 482ecb8fba..28da923497 100644 --- a/erts/test/z_SUITE.erl +++ b/erts/test/z_SUITE.erl @@ -236,8 +236,8 @@ format_core(#core_search_conf{file = false}, Core, Ignore) -> [Ignore, Core] ++ mod_time_list(Core)); format_core(#core_search_conf{file = File}, Core, Ignore) -> FRes = str_strip(os:cmd(File ++ " " ++ Core)), - case catch regexp:match(FRes, Core) of - {match, _, _} -> + case catch re:run(FRes, Core, [caseless,{capture,none}]) of + match -> io:format(" ~s~s " ++ time_fstr() ++ "~n", [Ignore, FRes] ++ mod_time_list(Core)); _ -> |