aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-14 11:52:57 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-14 11:52:57 +0200
commit04e79317308588af47f236469e9d286dccc177ec (patch)
treecbe94dc279695aa8f618fb6a0e94adb5828e1154 /lib
parent5fb93f69a6a0cb99d3ebdead3f2549e01a6d6aa8 (diff)
parent135309a30d70c5564d774d503d8bbe789446599c (diff)
downloadotp-04e79317308588af47f236469e9d286dccc177ec.tar.gz
otp-04e79317308588af47f236469e9d286dccc177ec.tar.bz2
otp-04e79317308588af47f236469e9d286dccc177ec.zip
Merge branch 'egil/fix-dyntrace-test'
* egil/fix-dyntrace-test: runtime_tools: Skip dyntrace test if LTTng is enabled
Diffstat (limited to 'lib')
-rw-r--r--lib/runtime_tools/test/dyntrace_SUITE.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/runtime_tools/test/dyntrace_SUITE.erl b/lib/runtime_tools/test/dyntrace_SUITE.erl
index ed40cde0fb..f3c1cce8f8 100644
--- a/lib/runtime_tools/test/dyntrace_SUITE.erl
+++ b/lib/runtime_tools/test/dyntrace_SUITE.erl
@@ -48,7 +48,9 @@ all() ->
dtrace ->
[{group,smoke}];
systemtap ->
- {skip,"SystemTap tests currently not supported"}
+ {skip,"SystemTap tests currently not supported"};
+ lttng ->
+ {skip,"LTTng tests currently not supported"}
end.
groups() ->