diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-11-26 14:55:41 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-05-19 14:38:15 +0200 |
| commit | bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea (patch) | |
| tree | 7a767a3e37ede77ee9fd5bae5bef0e168939baf5 /lib/ssh/test/ssh.spec | |
| parent | 2c0bd506cb99362635ebc0aafae36a95dc0a08b3 (diff) | |
| download | otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.tar.gz otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.tar.bz2 otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.zip | |
Add test suite for ssh
Diffstat (limited to 'lib/ssh/test/ssh.spec')
| -rw-r--r-- | lib/ssh/test/ssh.spec | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh.spec b/lib/ssh/test/ssh.spec index 8de0fe44e4..c420b119ac 100644 --- a/lib/ssh/test/ssh.spec +++ b/lib/ssh/test/ssh.spec @@ -1,3 +1,4 @@ +<<<<<<< HEAD {suites,"../ssh_test",all}. {skip_cases,"../ssh_test",ssh_ssh_SUITE, [ssh], @@ -5,3 +6,11 @@ {skip_cases,"../ssh_test",ssh_ssh_SUITE, [ssh_compressed], "Current implementation is timingdependent hence will succeed/fail on a whim"}. +======= +{topcase, {dir, "../ssh_test"}}. +{require_nodenames, 1}. +{skip, {ssh_ssh_SUITE, ssh, "Current implementation is timingdependent and +hence will succeed/fail on a whim"}}. +{skip, {ssh_ssh_SUITE, ssh_compressed, +"Current implementation is timingdependent hence will succeed/fail on a whim"}}. +>>>>>>> Add test suite for ssh |