diff options
author | Björn Gustavsson <[email protected]> | 2012-02-07 08:31:03 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-02-07 08:31:03 +0100 |
commit | d4332565d1a6480fe46fd72284e39dbf4670327e (patch) | |
tree | 6332b544627aca61665abbae8c7203cb9e74379e /lib/tools/test | |
parent | 7ec7e60aea883bbc7d09e7dd6b68061ee8c6b15b (diff) | |
parent | f028f375e7e7bc1f859e247651c5ddb816bdd208 (diff) | |
download | otp-d4332565d1a6480fe46fd72284e39dbf4670327e.tar.gz otp-d4332565d1a6480fe46fd72284e39dbf4670327e.tar.bz2 otp-d4332565d1a6480fe46fd72284e39dbf4670327e.zip |
Merge branch 'bjorn/hipe-test-cases' into maint
* bjorn/hipe-test-cases:
debugger tests: Increase time trap timeout
fprof_SUITE: Skip create_file_slow/1 if libraries are native
etop_SUITE: Skip a test case if libraries are native-compiled
Skip all inviso test cases if libraries are native-compiled
erl_prim_loader_SUITE: Handle native-compiled erl_boot_server
re_SUITE: Skip error_handling/1 if 're' is native code
shell_SUITE: Handle different EXIT reasons from native code
sofs_SUITE: Handle different EXIT reasons from native code
erl_eval_SUITE: Skip test of parameterized modules if native code
trace_port_SUITE: Skip test cases if 'lists' is native-compiled
call_trace_SUITE: Skip test cases if libraries are native-compiled
Diffstat (limited to 'lib/tools/test')
-rw-r--r-- | lib/tools/test/fprof_SUITE.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl index 0da6d4a9ea..f491c1e227 100644 --- a/lib/tools/test/fprof_SUITE.erl +++ b/lib/tools/test/fprof_SUITE.erl @@ -191,11 +191,17 @@ tail_seq(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -create_file_slow(doc) -> - ["Tests the create_file_slow benchmark"]; -create_file_slow(suite) -> - []; -create_file_slow(Config) when is_list(Config) -> +%% Tests the create_file_slow benchmark. +create_file_slow(Config) -> + case test_server:is_native(lists) orelse + test_server:is_native(file) of + true -> + {skip,"Native libs -- tracing does not work"}; + false -> + do_create_file_slow(Config) + end. + +do_create_file_slow(Config) -> ?line Timetrap = ?t:timetrap(?t:seconds(40)), ?line PrivDir = ?config(priv_dir, Config), ?line TraceFile = |