diff options
| author | Björn Gustavsson <[email protected]> | 2012-02-07 08:42:14 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-02-07 08:42:14 +0100 |
| commit | ee20527da3c90d1f7c10e7702237f9c71e23a3cd (patch) | |
| tree | 66f1ddbef7c609bd955e6708e72a43da903017eb /erts/emulator/test/trace_port_SUITE.erl | |
| parent | 59243ad0651d09347d2fc11cb0dbc16e9ec767ba (diff) | |
| parent | d4332565d1a6480fe46fd72284e39dbf4670327e (diff) | |
| download | otp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.tar.gz otp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.tar.bz2 otp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.zip | |
Merge branch 'maint'
* maint:
erlang.xml: Fix a few typos and grammatical errors
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 'erts/emulator/test/trace_port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/trace_port_SUITE.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl index 0026da4979..b0ce6f81db 100644 --- a/erts/emulator/test/trace_port_SUITE.erl +++ b/erts/emulator/test/trace_port_SUITE.erl @@ -77,7 +77,8 @@ end_per_testcase(_Func, Config) -> call_trace(doc) -> "Test sending call trace messages to a port."; call_trace(Config) when is_list(Config) -> - case test_server:is_native(?MODULE) of + case test_server:is_native(?MODULE) orelse + test_server:is_native(lists) of true -> {skip,"Native code"}; false -> @@ -128,7 +129,8 @@ bs_sum_c(<<>>, Acc) -> Acc. return_trace(doc) -> "Test the new return trace."; return_trace(Config) when is_list(Config) -> - case test_server:is_native(?MODULE) of + case test_server:is_native(?MODULE) orelse + test_server:is_native(lists) of true -> {skip,"Native code"}; false -> |