From cf0385b20b8c17220029c2419c7b97977375d86e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 8 Jun 2010 15:30:11 +0000
Subject: OTP-7907: [httpc|httpd] - Now allow the use of the "new" ssl.
 OTP-8564: Update deprecated status. OTP-8573: Inets mod_alias URL rewrite.

---
 lib/inets/test/httpd_SUITE.erl    | 31 +++++++++++++++++++++++++------
 lib/inets/test/inets_test_lib.erl |  6 ++++++
 lib/inets/test/inets_test_lib.hrl | 15 ++++++++++-----
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 3c9b5e41a7..3255cbec06 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -1775,7 +1775,16 @@ essl_time_test(Config) when is_list(Config) ->
 
 ssl_time_test(Tag, Config) when is_list(Config) ->
     %% <CONDITIONAL-SKIP>
-    Skippable = [win32],
+    FreeBSDVersionVerify = 
+	fun() ->
+		case os:version() of
+		    {7, 1, _} -> % We only have one such machine, so...
+			true;
+		    _ ->
+			false
+		end
+	end,
+    Skippable = [win32, {unix, [{freebsd, FreeBSDVersionVerify}]}],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
@@ -2271,12 +2280,22 @@ ssl_restart_disturbing_block(Tag, Config) ->
 	fun() -> 
 		case os:type() of
 		    {unix, linux} ->
-			HW = string:strip(os:cmd("uname -m"), right, $\n),
-			case HW of
+			case ?OSCMD("uname -m") of
 			    "ppc" ->
-				case inet:gethostname() of
-				    {ok, "peach"} ->
-					true;
+				case file:read_file_info("/etc/fedora-release") of
+				    {ok, _} ->
+					case ?OSCMD("awk '{print $2}' /etc/fedora-release") of
+					    "release" ->
+						%% Fedora 7 and later
+						case ?OSCMD("awk '{print $3}' /etc/fedora-release") of
+						    "7" ->
+							true;
+						    _ ->
+							false
+						end;
+					    _ ->
+						false
+					end;
 				    _ ->
 					false
 				end;
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 707b8c026a..86fc2d1a32 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -31,10 +31,16 @@
 -export([info/4, log/4, debug/4, print/4]).
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
+-export([oscmd/1]).
 -export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
 -export([flush/0]).
 -export([start_node/1, stop_node/1]).
 
+%% -- Misc os command and stuff
+
+oscmd(Cmd) ->
+  string:strip(os:cmd(Cmd), right, $\n).
+
 %% -- Misc node operation wrapper functions --
 
 start_node(Name) ->
diff --git a/lib/inets/test/inets_test_lib.hrl b/lib/inets/test/inets_test_lib.hrl
index 12a43fa136..0cdb04139c 100644
--- a/lib/inets/test/inets_test_lib.hrl
+++ b/lib/inets/test/inets_test_lib.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%
@@ -46,6 +46,11 @@
 -endif.
 
 
+%% - OS Command and stuff
+
+-define(OSCMD(Cmd), inets_test_lib:oscmd(Cmd)).
+
+
 %% - Test case macros -
 
 -define(EXPANDABLE(I, C, F), inets_test_lib:expandable(I, C, F)).
-- 
cgit v1.2.3