From a5c3feee7bfa77eb385334272505ed562c7ef0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 18 Jun 2015 17:56:58 +0200
Subject: erts: Remove halfword specific tests

---
 erts/emulator/test/alloc_SUITE.erl       | 14 ++------------
 erts/emulator/test/driver_SUITE.erl      | 12 +-----------
 erts/emulator/test/system_info_SUITE.erl |  2 --
 3 files changed, 3 insertions(+), 25 deletions(-)

(limited to 'erts/emulator/test')

diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 7c7ddde5d4..3ad1b88b2d 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -113,13 +113,10 @@ cpool(doc) ->   [];
 cpool(Cfg) -> ?line drv_case(Cfg).
 
 erts_mmap(Config) when is_list(Config) ->
-    case {?t:os_type(), is_halfword_vm()} of
-	{{unix, _}, false} ->
+    case ?t:os_type() of
+	{unix, _} ->
 	    [erts_mmap_do(Config, SCO, SCRPM, SCRFSD)
 	     || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]];
-
-	{_,true} ->
-	    {skipped, "No supercarrier support on halfword vm"};
 	{SkipOs,_} ->
 	    ?line {skipped,
 		   lists:flatten(["Not run on "
@@ -254,10 +251,3 @@ start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
 
 stop_node(Node) ->
     ?t:stop_node(Node).
-
-is_halfword_vm() ->
-    case {erlang:system_info({wordsize, internal}),
-	  erlang:system_info({wordsize, external})} of
-	{4, 8} -> true;
-	{WS, WS} -> false
-    end.
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 4211c49848..b72d6cbe52 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -1877,10 +1877,7 @@ mseg_alloc_cached_segments() ->
     mseg_alloc_cached_segments(mseg_inst_info(0)).
 
 mseg_alloc_cached_segments(MsegAllocInfo) ->
-    MemName = case is_halfword_vm() of
-	true -> "high memory";
-	false -> "all memory"
-    end,
+    MemName = "all memory",
     ?line [{memkind,DrvMem}]
 	= lists:filter(fun(E) -> case E of
 				    {memkind, [{name, MemName} | _]} -> true;
@@ -1899,13 +1896,6 @@ mseg_inst_info(I) ->
 			  erlang:system_info({allocator,mseg_alloc})),
     Value.
 
-is_halfword_vm() ->
-    case {erlang:system_info({wordsize, internal}),
-	  erlang:system_info({wordsize, external})} of
-	{4, 8} -> true;
-	{WS, WS} -> false
-    end.
-
 driver_alloc_sbct() ->
     {_, _, _, As} = erlang:system_info(allocator),
     case lists:keysearch(driver_alloc, 1, As) of
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index bee42c07d9..51122e5d55 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -185,8 +185,6 @@ wordsize(Config) when is_list(Config) ->
 	    {comment, "True 32-bit emulator"};
 	{8,8} ->
 	    {comment, "True 64-bit emulator"};
-	{8,4} ->
-	    {comment, "Halfword 64-bit emulator"};
 	Other ->
 	    exit({unexpected_wordsizes,Other})
     end.
-- 
cgit v1.2.3