summaryrefslogtreecommitdiffstats
path: root/testsuite/timeout01
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-09 22:52:54 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-10 09:08:23 +0200
commite599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch)
tree1172b8b830a1c3236e45c834c2b80e01325ea144 /testsuite/timeout01
parentMove files to match FreeBSD layout (diff)
downloadrtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files are mapped by the translation script: o rtems/bsd/sys/_types.h o rtems/bsd/sys/errno.h o rtems/bsd/sys/lock.h o rtems/bsd/sys/param.h o rtems/bsd/sys/resource.h o rtems/bsd/sys/time.h o rtems/bsd/sys/timespec.h o rtems/bsd/sys/types.h o rtems/bsd/sys/unistd.h It is now possible to include <sys/socket.h> directly for example. Generate one Makefile which builds everything including tests.
Diffstat (limited to 'testsuite/timeout01')
-rw-r--r--testsuite/timeout01/Makefile27
-rw-r--r--testsuite/timeout01/init.c2
-rw-r--r--testsuite/timeout01/timeout_helper.c6
-rw-r--r--testsuite/timeout01/timeout_test.c14
4 files changed, 11 insertions, 38 deletions
diff --git a/testsuite/timeout01/Makefile b/testsuite/timeout01/Makefile
deleted file mode 100644
index 78a4b7ed..00000000
--- a/testsuite/timeout01/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include ../../config.inc
-
-APP = timeout01
-PGM=${ARCH}/$(APP).exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c timeout_helper.c timeout_test.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
-CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS) -Wno-unused -Wl,-Map,$(APP).map
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += $(APP).map *.dep
-
-all: ${ARCH} $(PGM)
-
-$(PGM): $(OBJS)
- -$(make-exe)
diff --git a/testsuite/timeout01/init.c b/testsuite/timeout01/init.c
index f1bd5291..e632bb0a 100644
--- a/testsuite/timeout01/init.c
+++ b/testsuite/timeout01/init.c
@@ -35,7 +35,7 @@
#include <rtems.h>
-#include <freebsd/bsd.h>
+#include <rtems/bsd/bsd.h>
#include "timeout_test.h"
#include "timeout_helper.h"
diff --git a/testsuite/timeout01/timeout_helper.c b/testsuite/timeout01/timeout_helper.c
index 88d8510d..060fef0b 100644
--- a/testsuite/timeout01/timeout_helper.c
+++ b/testsuite/timeout01/timeout_helper.c
@@ -29,10 +29,10 @@
* SUCH DAMAGE.
*/
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
+#include <sys/param.h>
+#include <sys/systm.h>
#include <assert.h>
#include <malloc.h>
diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c
index b89feb84..8ce0b41e 100644
--- a/testsuite/timeout01/timeout_test.c
+++ b/testsuite/timeout01/timeout_test.c
@@ -34,15 +34,15 @@
#include <stdio.h>
#include <unistd.h>
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
-#include <freebsd/sys/types.h>
-#include <freebsd/sys/systm.h>
+#include <rtems/bsd/sys/types.h>
+#include <sys/systm.h>
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/rwlock.h>
+#include <rtems/bsd/sys/param.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
#define TIMEOUT_MILLISECONDS (100)