From bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <psyeugenic@gmail.com>
Date: Fri, 26 Nov 2010 14:55:41 +0100
Subject: Add test suite for ssh

---
 lib/ssh/test/ssh.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib/ssh/test/ssh.spec')

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
-- 
cgit v1.2.3