erts: Remove VxWorks from tests

2 files changed, 1 insertions, 96 deletions

diff --git a/erts/emulator/test/port_bif_SUITE_data/port_test.c b/erts/emulator/test/port_bif_SUITE_data/port_test.c
index c6b128df66..28324a56a6 100644
--- a/erts/emulator/test/port_bif_SUITE_data/port_test.c
+++ b/erts/emulator/test/port_bif_SUITE_data/port_test.c
@@ -3,15 +3,6 @@
  * Purpose: A port program to be used for testing the open_port bif.
  */
 
-#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>
@@ -23,12 +14,7 @@
 #ifndef __WIN32__
 #include <unistd.h>
 
-#ifdef VXWORKS
-#include "reclaim.h"
-#include <sys/times.h>
-#else
 #include <sys/time.h>
-#endif 
 
 #define O_BINARY 0
 #define _setmode(fd, mode)
@@ -40,22 +26,13 @@
 #endif
 
 
-#ifdef VXWORKS
-#define REDIR_STDOUT(fd) ioTaskStdSet(0, 1, fd);
-#else
 #define REDIR_STDOUT(fd) if (dup2(fd, 1) == -1) { \
     fprintf(stderr, "%s: failed to duplicate handle %d to 1: %d\n", \
     port_data->progname, fd, errno); \
     exit(1); \
 }
-#endif
 
-#ifdef VXWORKS
-#define MAIN(argc, argv) port_test(argc, argv)
-#else
 #define MAIN(argc, argv) main(argc, argv)
-#endif
-
 
 extern int errno;
 
@@ -101,7 +78,6 @@ static void dump(unsigned char* buf, int sz, int max);
 static void replace_stdout(char* filename);
 static void generate_reply(char* spec);
 
-#ifndef VXWORKS
 #ifndef HAVE_STRERROR
 extern int sys_nerr;
 #ifndef sys_errlist /* sys_errlist is sometimes defined to
@@ -125,20 +101,13 @@ int err;
     return msgstr;
 }
 #endif
-#endif
-
 
 MAIN(argc, argv)
 int argc;
 char *argv[];
 {
   int ret;
-#ifdef VXWORKS
-  if(taskVarAdd(0, (int *)&port_data) != OK) {
-    fprintf(stderr, "Can't do taskVarAdd in port_test\n");
-    exit(1);
-  }
-#endif
+
   if((port_data = (PORT_TEST_DATA *) malloc(sizeof(PORT_TEST_DATA))) == NULL) {
     fprintf(stderr, "Couldn't malloc for port_data");
     exit(1);
@@ -508,9 +477,6 @@ dump(buf, sz, max)
 static void
 delay(unsigned ms)
 {
-#ifdef VXWORKS
-  taskDelay((sysClkRateGet() * ms) / 1000);
-#else
 #ifdef __WIN32__
   Sleep(ms);
 #else
@@ -520,7 +486,6 @@ delay(unsigned ms)
 
   select(0, NULL, NULL, NULL, &t);
 #endif
-#endif
 }
 
 /*
diff --git a/erts/emulator/test/port_bif_SUITE_data/reclaim.h b/erts/emulator/test/port_bif_SUITE_data/reclaim.h
deleted file mode 100644
index 1d57dc5b8a..0000000000
--- a/erts/emulator/test/port_bif_SUITE_data/reclaim.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __RECLAIM_H__
-#define __RECLAIM_H__
-
-
-/* The Erlang release for VxWorks includes a simple mechanism for
-   "resource reclamation" at task exit - it allows replacement of the
-   functions that open/close "files" and malloc/free memory with versions
-   that keep track, to be able to "reclaim" file descriptors and memory
-   when a task exits (regardless of *how* it exits).
-
-   The interface to this mechanism is made available via this file,
-   with the following caveats:
-
-   - The interface may change (or perhaps even be removed, though that
-     isn't likely until VxWorks itself provides similar functionality)
-     in future releases - i.e. you must always use the version of this
-     file that comes with the Erlang release you are using.
-
-   - Disaster is guaranteed if you use the mechanism incorrectly (see
-     below for the correct way), e.g. allocate memory with the "tracking"
-     version of malloc() and free it with the "standard" version of free().
-
-   - The mechanism (of course) incurs some performance penalty - thus
-     for a simple program you may be better off with careful programming,
-     making sure that you do whatever close()/free()/etc calls that are
-     appropriate at all exit points (though if you need to guard against
-     taskDelete() etc, things get messy...).
-
-   To use the mechanism, simply program your application normally, i.e.
-   use open()/close()/malloc()/free() etc as usual, but #include this
-   file before any usage of the relevant functions. NOTE: To avoid the
-   "disaster" mentioned above, you *must* #include it in *all* (or none)
-   of the files that manipulate a particular file descriptor, allocated
-   memory area, etc. Finally, note that you can obviously not load your
-   application before the Erlang system when using this interface.
-*/
-
-/* Sorry, no ANSI prototypes yet... */
-extern int save_open(),save_creat(),save_socket(),save_accept(),save_close();
-#define open	save_open
-#define creat	save_creat
-#define socket	save_socket
-#define accept	save_accept
-#define close	save_close
-extern FILE *save_fopen(), *save_fdopen(), *save_freopen();
-extern int save_fclose();
-#define fopen	save_fopen
-#define fdopen	save_fdopen
-#define freopen	save_freopen
-#define fclose	save_fclose
-/* XXX Should do opendir/closedir too... */
-extern char *save_malloc(), *save_calloc(), *save_realloc();
-extern void save_free(), save_cfree();
-#define malloc	save_malloc
-#define calloc	save_calloc
-#define realloc	save_realloc
-#define free	save_free
-#define cfree	save_cfree
-
-#endif