aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh.spec
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ssh/test/ssh.spec')
-rw-r--r--lib/ssh/test/ssh.spec9
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