kernel: Remove VxWorks from tests

17 files changed, 538 insertions, 881 deletions

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index f6d38e6d1f..69197d4915 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -579,30 +579,25 @@ sticky_compiler(File) ->
 pa_pz_option(suite) -> [];
 pa_pz_option(doc) -> ["Test that the -pa and -pz options work as expected"];
 pa_pz_option(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Slave nodes not supported on VxWorks"};
-	_ ->
-	    DDir = ?config(data_dir,Config),
-	    PaDir = filename:join(DDir,"pa"),
-	    PzDir = filename:join(DDir,"pz"),
-	    ?line {ok, Node}=?t:start_node(pa_pz1, slave,
-					   [{args,
-					     "-pa " ++ PaDir
-					     ++ " -pz " ++ PzDir}]),
-	    ?line Ret=rpc:call(Node, code, get_path, []),
-	    ?line [PaDir|Paths] = Ret,
-	    ?line [PzDir|_] = lists:reverse(Paths),
-	    ?t:stop_node(Node),
-	    ?line {ok, Node2}=?t:start_node(pa_pz2, slave,
-					    [{args,
-					      "-mode embedded " ++ "-pa "
-					      ++ PaDir ++ " -pz " ++ PzDir}]),
-	    ?line Ret2=rpc:call(Node2, code, get_path, []),
-	    ?line [PaDir|Paths2] = Ret2,
-	    ?line [PzDir|_] = lists:reverse(Paths2),
-	    ?t:stop_node(Node2)
-    end.
+    DDir = ?config(data_dir,Config),
+    PaDir = filename:join(DDir,"pa"),
+    PzDir = filename:join(DDir,"pz"),
+    {ok, Node}=?t:start_node(pa_pz1, slave,
+	[{args,
+		"-pa " ++ PaDir
+		++ " -pz " ++ PzDir}]),
+    Ret=rpc:call(Node, code, get_path, []),
+    [PaDir|Paths] = Ret,
+    [PzDir|_] = lists:reverse(Paths),
+    ?t:stop_node(Node),
+    {ok, Node2}=?t:start_node(pa_pz2, slave,
+	[{args,
+		"-mode embedded " ++ "-pa "
+		++ PaDir ++ " -pz " ++ PzDir}]),
+    Ret2=rpc:call(Node2, code, get_path, []),
+    [PaDir|Paths2] = Ret2,
+    [PzDir|_] = lists:reverse(Paths2),
+    ?t:stop_node(Node2).
 
 add_del_path(suite) ->
     [];
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 0c3f5c3514..0f811b8f73 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -126,11 +126,6 @@
 	 error, chunk, truncate, many_users, info, change_size,
 	 change_attribute, distribution, evil, otp_6278, otp_10131]).
 
-%% The following two lists should be mutually exclusive. To skip a case
-%% on VxWorks altogether, use the kernel.spec.vxworks file instead.
-%% PLEASE don't skip out of laziness, the goal is to make every
-%% testcase runnable on VxWorks.
-
 %% These test cases should be skipped if the VxWorks card is 
 %% configured without NFS cache.
 -define(SKIP_NO_CACHE,[distribution]).
@@ -5126,33 +5121,8 @@ stop_node(Node) ->
 %% If the board is configured without NFS, the port program will fail to load
 %% and this will return 0, which may or may not be the wrong thing to do.
 
-check_nfs(Config) ->
-    case (catch check_cache(Config)) of
-	N when is_integer(N) ->
-	    N;
-	_ ->
-	    0
-    end.
-
-check_cache(Config) ->
-    ?line Check = filename:join(?datadir(Config), "nfs_check"),
-    ?line P = open_port({spawn, Check}, [{line,100}, eof]),
-    ?line Size = receive
-		     {P,{data,{eol,S}}} ->
-			 list_to_integer(S)
-		 after 1000 ->
-			 erlang:display(got_timeout),
-			 exit(timeout)
-		 end,
-    ?line receive
-	      {P, eof} ->
-		  ok
-	  end,
-    ?line P ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    Size.
+check_nfs(_Config) ->
+    0.
 
 skip_expand([]) ->
     [];
@@ -5175,13 +5145,8 @@ skip_list(Config) ->
 	    skip_expand(?SKIP_LARGE_CACHE)
     end.
 
-should_skip(Test,Config) ->
-    case os:type() of
-	vxworks ->
-	    lists:member(Test, skip_list(Config));
-	_ ->
-	    false
-    end.
+should_skip(_Test,_Config) ->
+    false.
 
 %%-----------------------------------------------------------------
 %% The error_logger handler used.
diff --git a/lib/kernel/test/disk_log_SUITE_data/Makefile.src b/lib/kernel/test/disk_log_SUITE_data/Makefile.src
deleted file mode 100644
index cae2f23d29..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,15 +0,0 @@
-CC = @CC@
-LD = @LD@
-CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-CROSSLDFLAGS = @CROSSLDFLAGS@
-
-PROGS = nfs_check@exe@
-
-all: $(PROGS)
-
-nfs_check@exe@: nfs_check@obj@
-	$(LD) $(CROSSLDFLAGS) -o nfs_check nfs_check@obj@ @LIBS@
-
-nfs_check@obj@: nfs_check.c
-	$(CC) -c -o nfs_check@obj@ $(CFLAGS) nfs_check.c
-
diff --git a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c b/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
deleted file mode 100644
index 31e9ba8190..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Author: Patrik Nyblom
- * Purpose: A port program to check the NFS cache size on VxWorks (returns 0
- * for other platforms).
- */
-
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifdef VXWORKS
-extern unsigned nfsCacheSize;
-#define MAIN(argc, argv) nfs_check(argc, argv)
-#else
-#define MAIN(argc, argv) main(argc, argv)
-#endif
-
-
-MAIN(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef VXWORKS
-    char str[100];
-    sprintf(str,"%d\n", nfsCacheSize);
-    write(1, str, strlen(str));
-#else
-    fprintf(stdout,"0");
-    fflush(stdout);
-#endif
-    return 0;
-}
-
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 72239641e9..35502a1d27 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -110,56 +110,46 @@ get_file(Config) when is_list(Config) ->
 inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
 		       "from an already started boot server."];
 inet_existing(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_existing,
-	    ?line Host = host(),
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line {ok, Node} = start_node(Name, Args),
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_existing,
+    Host = host(),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ " -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    {ok, Node} = start_node(Name, Args),
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 inet_coming_up(doc) -> ["Start a node using the 'inet' loading method, ",
 			"but start the boot server afterwards."];
 inet_coming_up(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_coming_up,
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line Host = host(),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ 
-		" -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, Node} = start_node(Name, Args, [{wait, false}]),
-
-	    %% Wait a while, then start boot server, and wait for node to start.
-	    ?line test_server:sleep(test_server:seconds(6)),
-	    io:format("erl_boot_server:start_link([~p]).", [Host]),
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line wait_really_started(Node, 25),
-
-	    %% Check loader argument, then cleanup.
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_coming_up,
+    Cookie = atom_to_list(erlang:get_cookie()),
+    Host = host(),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ 
+	" -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, Node} = start_node(Name, Args, [{wait, false}]),
+
+    %% Wait a while, then start boot server, and wait for node to start.
+    test_server:sleep(test_server:seconds(6)),
+    io:format("erl_boot_server:start_link([~p]).", [Host]),
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    wait_really_started(Node, 25),
+
+    %% Check loader argument, then cleanup.
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 wait_really_started(Node, 0) ->
     test_server:fail({not_booted,Node});
@@ -249,8 +239,6 @@ multiple_slaves(doc) ->
      "verify that the boot server manages"];
 multiple_slaves(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
 	{ose,_} ->
 	    {comment, "OSE: multiple nodes not supported"};
 	_ ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 2b6af7e1fb..985aeb51e8 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -492,8 +492,6 @@ cur_dir_1(Config) when is_list(Config) ->
     ?line case os:type() of
 	      {unix, _} ->
 		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
-	      vxworks ->
-		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
 	      {win32, _} ->
 		  win_cur_dir_1(Config)
 	  end,
@@ -1038,32 +1036,29 @@ file_info_basic_file(Config) when is_list(Config) ->
 file_info_basic_directory(suite) -> [];
 file_info_basic_directory(doc) -> [];
 file_info_basic_directory(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    Dog = test_server:timetrap(test_server:seconds(5)),
 
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
     %% platforms such as Windows95.
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([?config(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    ?line test_directory(RootDir, read_write),
+    test_directory(RootDir, read_write),
 
     %% Note that on Windows file systems, 
     %% "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?FILE_MODULE:file_info/1 behaves as if they were
     %% directories.
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line test_directory("/", read_write),
-		  ?line test_directory("c:/", read_write),
-		  ?line test_directory("c:\\", read_write);
-	      {unix, _} ->
-		  ?line test_directory("/", read);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write)
-	  end,
-    ?line test_server:timetrap_cancel(Dog).
+    case os:type() of
+        {win32, _} ->
+            ?line test_directory("/", read_write),
+            ?line test_directory("c:/", read_write),
+            ?line test_directory("c:\\", read_write);
+        {unix, _} ->
+            ?line test_directory("/", read)
+    end,
+    test_server:timetrap_cancel(Dog).
 
 test_directory(Name, ExpectedAccess) ->
     ?line {ok,#file_info{size=Size,type=Type,access=Access,
@@ -1784,9 +1779,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?FILE_MODULE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?FILE_MODULE:delete("nul")
 	  end,
 
     ?line [] = flush(),
@@ -1801,148 +1794,133 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?FILE_MODULE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(NonEmptyDir),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
-
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?FILE_MODULE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?FILE_MODULE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = 
-		filename:join(Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, enotdir},
-			 ?FILE_MODULE:rename(ADirectory, File)),
-	    
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?FILE_MODULE:rename(File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				    ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line [] = flush(),
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ok = ?FILE_MODULE:make_dir(Base),
+
+    %% Create an empty directory.
+    EmptyDir = filename:join(Base, "empty_dir"),
+    ok = ?FILE_MODULE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ok = ?FILE_MODULE:make_dir(NonEmptyDir),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ADirectory = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:make_dir(ADirectory),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    File = filename:join(Base, "just_a_file"),
+    ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    {error, eexist} = ?FILE_MODULE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    {error, einval} = ?FILE_MODULE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    {error, einval} = 
+    ?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, EmptyDir)),
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    NonExistingFile = filename:join(Base, "non_existing_file"),
+    {error, enoent} = ?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, enotdir},
+	?FILE_MODULE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    Comment = case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    NameOnOtherFs = filename:join(OtherFs, filename:basename(File)),
+	    {ok, Com} = case ?FILE_MODULE:rename(File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
+    Comment.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_make_dir"),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_e_make_dir"),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% A component of the path does not exist.
-    ?line {error, enoent} = 
-	?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
+    {error, enoent} = ?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line case ?FILE_MODULE:make_dir(
-		  filename:join(Afile, "another_directory")) of
-	      {error, enotdir} -> io:format("Result: enotdir");
-	      {error, enoent} -> io:format("Result: enoent")
-	  end,
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    case ?FILE_MODULE:make_dir(
+            filename:join(Afile, "another_directory")) of
+        {error, enotdir} -> io:format("Result: enotdir");
+        {error, enoent} -> io:format("Result: enoent")
+    end,
 
     %% No permission (on Unix only).
     case os:type() of
 	{unix, _} ->
-	    ?line ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
-	    ?line {error, eacces} = 
-		?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
-	    ?line ?FILE_MODULE:write_file_info(
+	    ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
+	    ?FILE_MODULE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1950,57 +1928,50 @@ e_make_dir(Config) when is_list(Config) ->
 e_del_dir(suite) -> [];
 e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
-    ?line io:format("Base: ~p", [Base]),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
+    io:format("Base: ~p", [Base]),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% Delete a non-existent directory.
-    ?line {error, enoent} = 
+    {error, enoent} = 
 	?FILE_MODULE:del_dir(filename:join(Base, "non_existing")),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line {error, E1} = 
-	expect({error, enotdir}, {error, enoent},
-	       ?FILE_MODULE:del_dir(
-		 filename:join(Afile, "another_directory"))),
-    ?line io:format("Result: ~p", [E1]),
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    {error, E1} = expect({error, enotdir}, {error, enoent},
+	?FILE_MODULE:del_dir(
+	    filename:join(Afile, "another_directory"))),
+    io:format("Result: ~p", [E1]),
 
     %% Delete a non-empty directory.
-    ?line {error, E2} = 
-	expect({error, enotempty}, {error, eexist}, {error, eacces},
+    {error, E2} = expect({error, enotempty}, {error, eexist}, {error, eacces},
 	       ?FILE_MODULE:del_dir(Base)),
-    ?line io:format("Result: ~p", [E2]),
+    io:format("Result: ~p", [E2]),
 
     %% Remove the current directory.
-    ?line {error, E3} = 
-	expect({error, einval}, 
+    {error, E3} = expect({error, einval}, 
 	       {error, eperm}, % Linux and DUX
 	       {error, eacces},
 	       {error, ebusy},
 	       ?FILE_MODULE:del_dir(".")),
-    ?line io:format("Result: ~p", [E3]),
+    io:format("Result: ~p", [E3]),
 
     %% No permission.
     case os:type() of
 	{unix, _} ->
-	    ?line ADirectory = filename:join(Base, "no_perm"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=0}),
-	    ?line {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=8#600});
+	    ADirectory = filename:join(Base, "no_perm"),
+	    ok = ?FILE_MODULE:make_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2563,147 +2534,123 @@ delayed_write(doc) ->
     ["Tests the file open option {delayed_write, Size, Delay}"];
 
 delayed_write(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(20)),
-    %%
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line File = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_delayed_write.txt"),
-    ?line Data1 = "asdfghjkl",
-    ?line Data2 = "qwertyuio",
-    ?line Data3 = "zxcvbnm,.",
-    ?line Size = length(Data1),
-    ?line Size = length(Data2),
-    ?line Size = length(Data3),
-    ?line Data1Data1 = Data1++Data1,
-    ?line Data1Data1Data1 = Data1Data1++Data1,
-    ?line Data1Data1Data1Data1 = Data1Data1++Data1Data1,
+    Dog = ?t:timetrap(?t:seconds(20)),
+    
+    RootDir = ?config(priv_dir, Config),
+    File = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_delayed_write.txt"),
+    Data1 = "asdfghjkl",
+    Data2 = "qwertyuio",
+    Data3 = "zxcvbnm,.",
+    Size = length(Data1),
+    Size = length(Data2),
+    Size = length(Data3),
+    Data1Data1 = Data1++Data1,
+    Data1Data1Data1 = Data1Data1++Data1,
+    Data1Data1Data1Data1 = Data1Data1++Data1Data1,
     %%
     %% Test caching and normal close of non-raw file
-    ?line {ok, Fd1} = 
+    {ok, Fd1} = 
 	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd2, 1)
-	  end,
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(3000), % Wait until data flush on timeout
-    ?line {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd2, 1),
+    ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(3000), % Wait until data flush on timeout
+    {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ok = ?FILE_MODULE:close(Fd1), % Data flush on close
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
+    ok = ?FILE_MODULE:close(Fd2),
     %%
     %% Test implicit close through exit by file owning process, 
     %% raw file, default parameters.
-    ?line Parent = self(),
-    ?line Fun = 
-	fun () ->
-		Child = self(),
-		Test = 
-		    fun () ->
-			    ?line {ok, Fd} = 
-				?FILE_MODULE:open(File, 
-						  [raw, write, 
-						   delayed_write]),
-			    ?line ok = ?FILE_MODULE:write(Fd, Data1),
-			    ?line Parent ! {Child, wrote},
-			    ?line receive 
-				      {Parent, continue, Reason} -> 
-					  {ok, Reason}
-				  end
-		    end,
-		case (catch Test()) of
-		    {ok, Reason} ->
-			exit(Reason);
-		    Unknown ->
-			exit({Unknown, get(test_server_loc)})
-		end
-	end,
-    ?line Child1 = spawn(Fun),
-    ?line Mref1 = erlang:monitor(process, Child1),
-    ?line receive 
-	      {Child1, wrote} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1a ->
-		  ?t:fail(Down1a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd3, 1)
-	  end,
-    ?line Child1 ! {Parent, continue, normal},
-    ?line receive 
-	      {'DOWN', Mref1, process, Child1, normal} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1b ->
-		  ?t:fail(Down1b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    Parent = self(),
+    Fun = fun() ->
+	    Child = self(),
+	    Test = 
+	    fun () ->
+		    {ok, Fd} = ?FILE_MODULE:open(File, 
+			[raw, write, delayed_write]),
+		    ok = ?FILE_MODULE:write(Fd, Data1),
+		    Parent ! {Child, wrote},
+		    receive 
+			{Parent, continue, Reason} -> 
+			    {ok, Reason}
+		    end
+	    end,
+	    case (catch Test()) of
+		{ok, Reason} -> exit(Reason);
+		Unknown ->
+		    exit({Unknown, get(test_server_loc)})
+	    end
+    end,
+    Child1 = spawn(Fun),
+    Mref1 = erlang:monitor(process, Child1),
+    receive 
+        {Child1, wrote} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1a ->
+            ?t:fail(Down1a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd3, 1),
+    Child1 ! {Parent, continue, normal},
+    receive 
+        {'DOWN', Mref1, process, Child1, normal} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1b ->
+            ?t:fail(Down1b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
+    ok = ?FILE_MODULE:close(Fd3),
     %%
     %% The same again, but this time with reason 'kill'.
-    ?line Child2 = spawn(Fun),
-    ?line Mref2 = erlang:monitor(process, Child2),
-    ?line receive 
-	      {Child2, wrote} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2a ->
-		  ?t:fail(Down2a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd4, 1)
-	  end,
-    ?line Child2 ! {Parent, continue, kill},
-    ?line receive 
-	      {'DOWN', Mref2, process, Child2, kill} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2b ->
-		  ?t:fail(Down2b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line eof = ?FILE_MODULE:pread(Fd4, bof, 1),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    Child2 = spawn(Fun),
+    Mref2 = erlang:monitor(process, Child2),
+    receive 
+        {Child2, wrote} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2a ->
+            ?t:fail(Down2a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd4, 1),
+    Child2 ! {Parent, continue, kill},
+    receive 
+        {'DOWN', Mref2, process, Child2, kill} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2b ->
+            ?t:fail(Down2b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    eof = ?FILE_MODULE:pread(Fd4, bof, 1),
+    ok  = ?FILE_MODULE:close(Fd4),
     %%
     %% Test if file position works with delayed_write
-    ?line {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
-					       delayed_write]),
-    ?line ok = ?FILE_MODULE:truncate(Fd5),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data3]),
-    ?line {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line Data3Data2 = Data3++Data2,
-    ?line {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd5),
+    {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
+          			       delayed_write]),
+    ok = ?FILE_MODULE:truncate(Fd5),
+    ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    ok = ?FILE_MODULE:write(Fd5, [Data3]),
+    {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    Data3Data2 = Data3++Data2,
+    {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
+    ok = ?FILE_MODULE:close(Fd5),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
-    ?line case os:type() of
-	      vxworks -> 
-		  {comment, "Some lines skipped on vxworks"};
-	      _ ->
-		  ok
-	  end.
+    [] = flush(),
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 
 pid2name(doc) -> "Tests file:pid2name/1.";
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index 5bbaeb02ad..94f95798a0 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -190,24 +190,19 @@ echo_test_1(SockOpts, EchoFun, Config0) ->
     ok.
 
 echo_packet(SockOpts, EchoFun, Opts) ->
-    ?line Type =
-	case lists:keysearch(type, 1, Opts) of
-	    {value, {type, T}} ->
-		T;
-	    _ ->
-		{value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
-		T
-	end,
+    Type = case lists:keysearch(type, 1, Opts) of
+	{value, {type, T}} ->
+	    T;
+	_ ->
+	    {value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
+	    T
+    end,
 
     %% Connect to the echo server.
-    ?line EchoPort = ?config(echo_port, Opts),
-    ?line {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
+    EchoPort = ?config(echo_port, Opts),
+    {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
 
-    ?line SlowEcho = 
-	case os:type() of
-	    vxworks -> true;
-	    _ -> lists:member(slow_echo, Opts)
-	end,
+    SlowEcho = lists:member(slow_echo, Opts),
 
     case Type of
 	http ->
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, _) ->
     [];
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 233e438dc9..31005a01e2 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -266,13 +266,8 @@ dont_drop(doc) ->
      "set just before halt on very high I/O load."];
 dont_drop(Config) when is_list(Config) ->
     %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
-	    ok
-    end.
+    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
+    ok.
 
 do_dont_drop(_,0) ->
     [];
@@ -333,13 +328,7 @@ kill_pid(doc) ->
     ["Tests that heart kills the old erlang node before executing ",
      "heart command."];
 kill_pid(Config) when is_list(Config) ->
-    %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    ok = do_kill_pid(Config)
-    end.
+    ok = do_kill_pid(Config).
 
 do_kill_pid(_Config) ->
     Name = heart_test,
diff --git a/lib/kernel/test/heart_SUITE_data/simple_echo.c b/lib/kernel/test/heart_SUITE_data/simple_echo.c
index 0093dbce9b..a92bb8af95 100644
--- a/lib/kernel/test/heart_SUITE_data/simple_echo.c
+++ b/lib/kernel/test/heart_SUITE_data/simple_echo.c
@@ -2,11 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef VXWORKS
-int simple_echo(void){
-#else
 int main(void){
-#endif
   int x;
   while((x = getchar()) != EOF){
     putchar(x);
@@ -14,4 +10,3 @@ int main(void){
   }
   return 0;
 }
-      
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 7241b093d0..ce138b6804 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -66,7 +66,7 @@ required(v6) ->
      {require, test_dummy_ipv6_host}];
 required(hosts) ->
     case os:type() of
-	{OS, _} when OS =:= win32; OS =:= vxworks ->
+	{OS, _} when OS =:= win32 ->
 	    [{require, hardcoded_hosts},
 	     {require, hardcoded_ipv6_hosts}];
 	_Else ->
@@ -614,17 +614,12 @@ t_gethostnative(Config) when is_list(Config) ->
 %% this will result in 26 bytes sent which causes problem in Windows
 %% if the port-program has not assured stdin to be read in BINARY mode
 %% OTP-2555
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks has no native gethostbyname()"};
-	_ ->
-	    ?line case inet_gethost_native:gethostbyname(
-			 "a23456789012345678901234") of
-		      {error,notfound} ->
-			  ?line ok;
-		      {error,no_data} ->
-			  ?line ok
-		  end
+    ?line case inet_gethost_native:gethostbyname(
+	    "a23456789012345678901234") of
+	{error,notfound} ->
+	    ?line ok;
+	{error,no_data} ->
+	    ?line ok
     end.
 
 gethostnative_parallell(suite) ->    
diff --git a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
index f24c93edf5..9c8f8eb91a 100644
--- a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
+++ b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
@@ -1,12 +1,3 @@
-#if defined(VXWORKS)
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-int sockopt_helper(void){
-    return 0;
-}
-#else
-
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
@@ -215,5 +206,3 @@ int main(void){
     } while (x != C_QUIT);
     return 0;
 }
-#endif
-      
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index e3fa4642b7..1993cd0b32 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -256,47 +256,42 @@ get_plain_arguments(Config) when is_list(Config) ->
 boot_var(doc) -> [];
 boot_var(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 boot_var(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+    ?line Dog = ?t:timetrap(?t:seconds(100)),
+
+    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
+
+    %% Should fail as we have not given -boot_var TEST_VAR
+    ?line {error, timeout} =
+    start_node(init_test, "-boot " ++ BootScript),
+
+    case is_real_system(KernelVsn, StdlibVsn) of
+	true ->
+	    %% Now it should work !!
+	    ?line {ok, Node} =
+	    start_node(init_test,
+		"-boot " ++ BootScript ++
+		" -boot_var TEST_VAR " ++ TEST_VAR),
+	    stop_node(Node),
+	    Res = ok;
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(100)),
-	    
-	    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
-
-	    %% Should fail as we have not given -boot_var TEST_VAR
-	    ?line {error, timeout} =
-		start_node(init_test, "-boot " ++ BootScript),
-	    
-	    case is_real_system(KernelVsn, StdlibVsn) of
-		true ->
-		    %% Now it should work !!
-		    ?line {ok, Node} =
-			start_node(init_test,
-				   "-boot " ++ BootScript ++
-				   " -boot_var TEST_VAR " ++ TEST_VAR),
-		    stop_node(Node),
-		    Res = ok;
-		_ ->
-%% What we need is not so much version numbers on the directories, but
-%% for the boot var TEST_VAR to appear in the boot script, and it doesn't
-%% if we give the 'local' option to systools:make_script.
-		    ?t:format(
-		       "Test case not complete as we are not~n"
-		       "running in a real system!~n"
-		       "Probably this test is performed in a "
-		       "clearcase view or source tree.~n"
-		       "Need version numbers on the kernel and "
-		       "stdlib directories!~n",
-		       []),
-		    Res = {skip,
-			   "Test case only partially run since it is run "
-			   "in a clearcase view or in a source tree. "
-			   "Need an installed system to complete this test."}
-	    end,
-	    ?line ?t:timetrap_cancel(Dog),
-	    Res
-    end.
+	    %% What we need is not so much version numbers on the directories, but
+	    %% for the boot var TEST_VAR to appear in the boot script, and it doesn't
+	    %% if we give the 'local' option to systools:make_script.
+	    ?t:format(
+		"Test case not complete as we are not~n"
+		"running in a real system!~n"
+		"Probably this test is performed in a "
+		"clearcase view or source tree.~n"
+		"Need version numbers on the kernel and "
+		"stdlib directories!~n",
+		[]),
+	    Res = {skip,
+		"Test case only partially run since it is run "
+		"in a clearcase view or in a source tree. "
+		"Need an installed system to complete this test."}
+    end,
+    ?line ?t:timetrap_cancel(Dog),
+    Res.
 
 create_boot(Config) ->
     ?line {ok, OldDir} = file:get_cwd(),
@@ -579,55 +574,47 @@ script_id(Config) when is_list(Config) ->
 boot1(doc) -> [];
 boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot1(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
-	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-	    Args = args() ++ " -boot start_sasl",
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    %% Try to start with non existing boot file.
-	    Args1 = args() ++ " -boot dummy_script",
-	    ?line {error, timeout} = start_node(init_test, Args1),
-	    
-	    ?line ?t:timetrap_cancel(Dog),
-	    ok
-    end.
+    ?line Dog = ?t:timetrap(?t:seconds(80)),
+    Args = args() ++ " -boot start_sasl",
+    ?line {ok, Node} = start_node(init_test, Args),
+    ?line stop_node(Node),
+
+    %% Try to start with non existing boot file.
+    Args1 = args() ++ " -boot dummy_script",
+    ?line {error, timeout} = start_node(init_test, Args1),
+
+    ?line ?t:timetrap_cancel(Dog),
+    ok.
 
 boot2(doc) -> [];
 boot2(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot2(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:seconds(80)),
+
+    %% Absolute boot file name
+    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
+
+    Args = args() ++ " -boot \"" ++ Boot++"\"",
+    {ok, Node} = start_node(init_test, Args),
+    stop_node(Node),
+
     case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+	{win32, _} ->
+	    %% Absolute boot file name for Windows -- all slashes are
+	    %% converted to backslashes.
+	    Win_boot = lists:map(fun
+		    ($/) -> $\\;
+		    (C) -> C 
+		end, Boot),
+	    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
+	    {ok, Node2} = start_node(init_test, Args2),
+	    stop_node(Node2);
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-
-	    %% Absolute boot file name
-	    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
-
-	    Args = args() ++ " -boot \"" ++ Boot++"\"",
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    case os:type() of 
-		{win32, _} ->
-		    %% Absolute boot file name for Windows -- all slashes are
-		    %% converted to backslashes.
-		    Win_boot = lists:map(fun($/) -> $\\; (C) -> C end,
-					 Boot),
-		    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
-		    ?line {ok, Node2} = start_node(init_test, Args2),
-		    ?line stop_node(Node2);
-		_ ->
-		    ok
-	    end,
-
-	    ?line ?t:timetrap_cancel(Dog),
 	    ok
-    end.
+    end,
+
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 %% Misc. functions    
 
diff --git a/lib/kernel/test/kernel.spec.wxworks b/lib/kernel/test/kernel.spec.wxworks
deleted file mode 100644
index 370e474e64..0000000000
--- a/lib/kernel/test/kernel.spec.wxworks
+++ /dev/null
@@ -1,63 +0,0 @@
-%% -*- erlang -*-
-{suites,"kernel_test",all}.
-{skip_cases,"kernel_test",bif_SUITE,[spawn_link_race1],"Known bug."}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_write_file],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [cur_dir_0],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_info_times],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_write_file_info],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [truncate],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_delete],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [delayed_write],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_ahead],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_write],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_read],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",init_SUITE,[restart],"Uses peer nodes"}.
-{skip_cases,"kernel_test",os_SUITE,[space_in_cwd],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,
-            [space_in_name],
-            "VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,[quoting],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_recv],
-            "Test not adopted to slaves on different machine"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_exit],
-            "Test not adopted to slaves on different machine"}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index ae3410d13f..3f2195b609 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -202,8 +202,6 @@ find_executable(Config) when is_list(Config) ->
 
 	    %% Never return a directory name.
 	    ?line false = os:find_executable("unix", [DataDir]),
-	    ok;
-	vxworks -> 
 	    ok
     end.
 
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 8afdfc8a47..60b818cbe3 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -152,7 +152,6 @@ heavy(Config) when is_list(Config) ->
     time(5000),
     ?M([],get()),
     case {os:type(),?t:is_debug()} of
-	{vxworks,_} -> ok;
 	{_,true} -> ok;	    
 	_ ->
 	    time(50000),
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 3e2202922c..a56746bbc4 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -406,9 +406,6 @@ cur_dir_1(Config, Handle) ->
 	      {unix, _} ->
 		  ?line {error, enotsup} = 
 		      ?PRIM_FILE_call(get_cwd, Handle, ["d:"]);
-	      vxworks ->
-		  ?line {error, enotsup} = 
-		      ?PRIM_FILE_call(get_cwd, Handle,  ["d:"]);
 	      {win32, _} ->
 		  win_cur_dir_1(Config, Handle)
 	  end,
@@ -843,10 +840,7 @@ file_info_basic_directory(Config, Handle) ->
 		  ?line test_directory("c:/", read_write, Handle),
 		  ?line test_directory("c:\\", read_write, Handle);
 	      {unix, _} ->
-		  ?line test_directory("/", read, Handle);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write, Handle)
+		  ?line test_directory("/", read, Handle)
 	  end,
     ?line test_server:timetrap_cancel(Dog).
 
@@ -1508,9 +1502,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?PRIM_FILE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?PRIM_FILE:delete("nul")
 	  end,
 
     ?line test_server:timetrap_cancel(Dog),
@@ -1524,110 +1516,105 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?PRIM_FILE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
+    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line RootDir = ?config(priv_dir, Config),
+    ?line Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ?line ok = ?PRIM_FILE:make_dir(Base),
 
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?PRIM_FILE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = filename:join(
-				      Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, enotdir},
-			 ?PRIM_FILE:rename(ADirectory, File)),
-
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, 
-					  filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?PRIM_FILE:rename(
-				    File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    %% Create an empty directory.
+    ?line EmptyDir = filename:join(Base, "empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ?line ADirectory = filename:join(Base, "a_directory"),
+    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    ?line File = filename:join(Base, "just_a_file"),
+    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    ?line {error, eexist} = 
+    ?PRIM_FILE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    ?line {error, einval} = 
+    ?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, EmptyDir)),
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    ?line NonExistingFile = filename:join(
+	Base, "non_existing_file"),
+    ?line {error, enoent} = 
+    ?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, enotdir},
+	?PRIM_FILE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    ?line Comment = 
+    case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    ?line NameOnOtherFs =
+	    filename:join(OtherFs, 
+		filename:basename(File)),
+	    ?line {ok, Com} = 
+	    case ?PRIM_FILE:rename(
+		    File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    ?line test_server:timetrap_cancel(Dog),
+    Comment.
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
@@ -1660,8 +1647,6 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?line 
 		?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),
@@ -1716,8 +1701,6 @@ e_del_dir(Config) when is_list(Config) ->
 	    ?line ?PRIM_FILE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),