diff options
| author | Hans Nilsson <[email protected]> | 2017-02-14 16:10:03 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-14 16:10:03 +0100 |
| commit | 70d5b560dc4894606ca7a09f3afd9a105b5a5d54 (patch) | |
| tree | e426f29f835b23c65e97b7a3147d00448d07da0a | |
| parent | dd60ebfa1f2f6dc203deee59f95305291d06a619 (diff) | |
| parent | aa1a098b46d0a4d8dd122efcc78a7a1a3f6c6e4e (diff) | |
| download | otp-70d5b560dc4894606ca7a09f3afd9a105b5a5d54.tar.gz otp-70d5b560dc4894606ca7a09f3afd9a105b5a5d54.tar.bz2 otp-70d5b560dc4894606ca7a09f3afd9a105b5a5d54.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 4327068b7b..313b7fc559 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -58,9 +58,11 @@ groups() -> || {Tag,Algs} <- ErlAlgos, lists:member(Tag,tags()) ], + + TypeSSH = ssh_test_lib:ssh_type(), AlgoTcSet = - [{Alg, [parallel], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos)} + [{Alg, [parallel], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos,TypeSSH)} || {Tag,Algs} <- ErlAlgos ++ DoubleAlgos, Alg <- Algs], @@ -313,18 +315,13 @@ concat(A1, A2) -> list_to_atom(lists:concat([A1," + ",A2])). split(Alg) -> ssh_test_lib:to_atoms(string:tokens(atom_to_list(Alg), " + ")). -specific_test_cases(Tag, Alg, SshcAlgos, SshdAlgos) -> +specific_test_cases(Tag, Alg, SshcAlgos, SshdAlgos, TypeSSH) -> [simple_exec, simple_sftp] ++ case supports(Tag, Alg, SshcAlgos) of - true -> - case ssh_test_lib:ssh_type() of - openSSH -> - [sshc_simple_exec_os_cmd]; - _ -> - [] - end; - false -> - [] + true when TypeSSH == openSSH -> + [sshc_simple_exec_os_cmd]; + _ -> + [] end ++ case supports(Tag, Alg, SshdAlgos) of true -> |