From eae988281f641302a6d19166f77306d8a3210895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 17 Jul 2012 16:55:05 +0200
Subject: kernel: Remove VxWorks from tests

---
 lib/kernel/test/gen_tcp_misc_SUITE.erl | 122 +++++++++++----------------------
 1 file changed, 39 insertions(+), 83 deletions(-)

(limited to 'lib/kernel/test/gen_tcp_misc_SUITE.erl')

diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 1592399996..5d45b91ee5 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -340,39 +340,23 @@ no_accept(doc) ->
      "a tcp_closed message."];
 no_accept(suite) -> [];
 no_accept(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    no_accept2()
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, {_, Port}} = inet:sockname(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, []),
+    ok = gen_tcp:close(L),
+    receive
+        {tcp_closed, Client} ->
+            ok
+    after 5000 ->
+            ?line test_server:fail(never_closed)
+    
     end.
 
-no_accept2() ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, {_, Port}} = inet:sockname(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, []),
-    ?line ok = gen_tcp:close(L),
-    ?line receive
-	      {tcp_closed, Client} ->
-		  ok
-	  after 5000 ->
-		  ?line test_server:fail(never_closed)
-	  
-	  end.
-
 close_with_pending_output(doc) ->
     ["Send several packets to a socket and close it.  All packets should arrive ",
      "to the other end."];
 close_with_pending_output(suite) -> [];
 close_with_pending_output(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Too tough for vxworks"};
-	_ ->
-	    close_with_pending_output2()
-    end.
-
-close_with_pending_output2() ->
     ?line {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
     ?line {ok, {_, Port}} = inet:sockname(L),
     ?line Packets = 16,
@@ -423,22 +407,16 @@ otp_3924(doc) ->
 otp_3924(suite) -> [];
 otp_3924(Config) when is_list(Config) ->
     MaxDelay = (case has_superfluous_schedulers() of
-		    true -> 4;
-		    false -> 1
-		end
-		* case {erlang:system_info(debug_compiled),
-			erlang:system_info(lock_checking)} of
-		      {true, _} -> 6;
-		      {_, true} -> 2;
-		      _ -> 1
-		  end * ?OTP_3924_MAX_DELAY),
-    case os:type() of
-	vxworks ->
-%%	    {skip,"Too tough for vxworks"};
-	    otp_3924_1(MaxDelay);
-	_ ->
-	    otp_3924_1(MaxDelay)
-    end.
+	    true -> 4;
+	    false -> 1
+	end
+	* case {erlang:system_info(debug_compiled),
+		erlang:system_info(lock_checking)} of
+	    {true, _} -> 6;
+	    {_, true} -> 2;
+	    _ -> 1
+	end * ?OTP_3924_MAX_DELAY),
+    otp_3924_1(MaxDelay).
 
 otp_3924_1(MaxDelay) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
@@ -559,26 +537,18 @@ otp_3924_sender(Receiver, Host, Port, Data) ->
 data_before_close(doc) ->
     ["Tests that a huge amount of data can be received before a close."];
 data_before_close(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    data_before_close2()
-    end.
-
-data_before_close2() ->
-    ?line {ok, L} = gen_tcp:listen(0, [binary]),
-    ?line {ok, {_, TcpPort}} = inet:sockname(L),
-    ?line Bytes = 256*1024,
-    ?line spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line case count_bytes_recv(A, 0) of
-	      {Bytes, Result} ->
-		  io:format("Result: ~p", [Result]);
-	      {Wrong, Result} ->
-		  io:format("Result: ~p", [Result]),
-		  test_server:fail({wrong_count, Wrong})
-	  end,
+    {ok, L} = gen_tcp:listen(0, [binary]),
+    {ok, {_, TcpPort}} = inet:sockname(L),
+    Bytes = 256*1024,
+    spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
+    {ok, A} = gen_tcp:accept(L),
+    case count_bytes_recv(A, 0) of
+        {Bytes, Result} ->
+            io:format("Result: ~p", [Result]);
+        {Wrong, Result} ->
+            io:format("Result: ~p", [Result]),
+            test_server:fail({wrong_count, Wrong})
+    end,
     ok.
 
 count_bytes_recv(Sock, Total) ->
@@ -611,32 +581,18 @@ get_status(Config) when is_list(Config) ->
     ?line {ok,{socket,Pid,_,_}} = gen_tcp:listen(5678,[]),
     ?line {status,Pid,_,_} = sys:get_status(Pid).
 
+-define(RECOVER_SLEEP, 60000).
+-define(RETRY_SLEEP, 15000).
+
 iter_max_socks(doc) ->
     ["Open as many sockets as possible. Do this several times and check ",
      "that we get the same number of sockets every time."];
 iter_max_socks(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    iter_max_socks2()
-    end.
-
--define(RECOVER_SLEEP, 60000).
--define(RETRY_SLEEP, 15000).
-
-iter_max_socks2() ->
-    ?line N = 
-	case os:type() of
-	    vxworks ->
-		10;
-	    _ ->
-		20
-	end,
+    N = 20,
     L = do_iter_max_socks(N, initalize),
-    ?line io:format("Result: ~p",[L]),
-    ?line all_equal(L),
-    ?line {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
+    io:format("Result: ~p",[L]),
+    all_equal(L),
+    {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_socks(0, _) ->
     [];
-- 
cgit v1.2.3