From 2c0bd506cb99362635ebc0aafae36a95dc0a08b3 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Mon, 24 Jan 2011 13:33:13 +0100
Subject: Update init_per_suite so that tests are skipped if crypto/ssh cannot
 be started.

---
 lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl')

diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 7e9b6024e5..6ad462deab 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -44,17 +44,20 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    ssh:stop(),
-    crypto:start(),
-    DataDir = ?config(data_dir, Config),
-    FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
-    c:c(FileAlt),
-    FileName = filename:join(DataDir, "test.txt"),
-    {ok, FileInfo} = file:read_file_info(FileName),
-    ok = file:write_file_info(FileName,
-			      FileInfo#file_info{mode = 8#400}),
-
-    Config.
+    catch ssh:stop(),
+    case catch crypto:start() of
+	ok ->
+	    DataDir = ?config(data_dir, Config),
+	    FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
+	    c:c(FileAlt),
+	    FileName = filename:join(DataDir, "test.txt"),
+	    {ok, FileInfo} = file:read_file_info(FileName),
+	    ok = file:write_file_info(FileName,
+				      FileInfo#file_info{mode = 8#400}),
+	    Config;
+	_Else ->
+	    {skip,"Could not start ssh!"}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
-- 
cgit v1.2.3