aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh.spec
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-12-21 14:00:23 +0100
committerHans Nilsson <[email protected]>2015-12-21 14:00:23 +0100
commitb35e3c4d3ce7bfecbb4f93a8d5101e83bac7e606 (patch)
tree394bdfa86280163b905bc216e2237ab5a096b3bd /lib/ssh/test/ssh.spec
parent21d6192389a04024f7a41ced9d0911a9cce6f4e8 (diff)
parent74faca0ac7e9e4f1d44ec43749aafe125d8a6371 (diff)
downloadotp-b35e3c4d3ce7bfecbb4f93a8d5101e83bac7e606.tar.gz
otp-b35e3c4d3ce7bfecbb4f93a8d5101e83bac7e606.tar.bz2
otp-b35e3c4d3ce7bfecbb4f93a8d5101e83bac7e606.zip
Merge branch 'hans/ssh/ssh_benchmark_SUITE' into maint
* hans/ssh/ssh_benchmark_SUITE: ssh: benchmark all common kex and cipher algorithms New structure of the report ssh: ssh_benchmark_SUITE re-organized ssh: Add first version of ssh_benchmark_SUITE
Diffstat (limited to 'lib/ssh/test/ssh.spec')
-rw-r--r--lib/ssh/test/ssh.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh.spec b/lib/ssh/test/ssh.spec
index 8de0fe44e4..a3296d97a1 100644
--- a/lib/ssh/test/ssh.spec
+++ b/lib/ssh/test/ssh.spec
@@ -1,4 +1,7 @@
{suites,"../ssh_test",all}.
+{skip_cases, "../ssh_test",
+ ssl_benchmark_SUITE, [openssh_shell,erl_shell],
+ "Benchmarks run separately"}.
{skip_cases,"../ssh_test",ssh_ssh_SUITE,
[ssh],
"Current implementation is timingdependent and\nhence will succeed/fail on a whim"}.