Add test suite for ssh

8 files changed, 22 insertions, 11 deletions

diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 78dcb9384b..fc88916e45 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -115,7 +115,11 @@ release_spec: opt
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
+<<<<<<< HEAD
 	$(INSTALL_DATA) ssh.spec ssh.cover $(RELSYSDIR)
+=======
+	$(INSTALL_DATA) ssh.spec $(RELSYSDIR)
+>>>>>>> Add test suite for ssh
 	$(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) $(RELSYSDIR)
 	@for dir in $(DATA_DIRS); do \
           if test ! -d $$dir ; then \
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
diff --git a/lib/ssh/test/ssh_SUITE.erl b/lib/ssh/test/ssh_SUITE.erl
index aa321527b8..953c9080f9 100644
--- a/lib/ssh/test/ssh_SUITE.erl
+++ b/lib/ssh/test/ssh_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index cb0d5483ab..2c0fd882a0 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -115,7 +115,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index ec2010e15a..0c4a7f3b3f 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -60,7 +60,7 @@ init_per_suite(Config) ->
 	{_,_} ->
 	    {skip,"Could not start crypto and ssh!"}
     end.
-	    
+
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 59445135b4..1afc206148 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 6ad462deab..c7107635c1 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -163,7 +163,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 close_file_OTP_6350(doc) ->
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 69a57aad1b..0c15c067a8 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -96,7 +96,8 @@ end_per_testcase(_TestCase, _Config) ->
 %%--------------------------------------------------------------------
 all() -> 
     case os:find_executable("ssh") of
-	false -> {skip, "openSSH not installed on host"};
+	false -> 
+	    {skip, "openSSH not installed on host"};
 	_ ->
 	    [erlang_shell_client_openssh_server,
 	     erlang_client_openssh_server_exec,
@@ -119,7 +120,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-
 %% TEST cases starts here.
 %%--------------------------------------------------------------------
 erlang_shell_client_openssh_server(doc) ->