summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 14:20:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 14:20:41 +0000
commita1bcc6e944f80290d49543678878cd06eab96d82 (patch)
tree1f0b96e1634a4577334d0b18cd944b063c697359 /c
parentPatch rtems-rc-19991117-15.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-a1bcc6e944f80290d49543678878cd06eab96d82.tar.bz2
Moved pmacros.h to include not support/include.
Diffstat (limited to 'c')
-rw-r--r--c/src/tests/psxtests/Makefile.am6
-rw-r--r--c/src/tests/psxtests/configure.in3
-rw-r--r--c/src/tests/psxtests/include/Makefile.am (renamed from c/src/tests/psxtests/support/include/Makefile.am)2
-rw-r--r--c/src/tests/psxtests/psx01/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx02/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx03/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx04/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx05/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx06/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx07/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx08/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx09/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx10/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx11/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx12/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psxcancel/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psxmsgq01/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psxsem01/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psxtimer/Makefile.am2
-rw-r--r--c/src/tests/psxtests/support/Makefile.am10
-rw-r--r--c/src/tests/psxtests/support/include/pmacros.h87
21 files changed, 21 insertions, 119 deletions
diff --git a/c/src/tests/psxtests/Makefile.am b/c/src/tests/psxtests/Makefile.am
index 95d7b19f0d..e25e2b2b1a 100644
--- a/c/src/tests/psxtests/Makefile.am
+++ b/c/src/tests/psxtests/Makefile.am
@@ -5,10 +5,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-SHARED_DIRS = support
+SHARED_DIRS =
-POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
- psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
+POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
+ psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13
diff --git a/c/src/tests/psxtests/configure.in b/c/src/tests/psxtests/configure.in
index 6900397421..36cb3d9b0b 100644
--- a/c/src/tests/psxtests/configure.in
+++ b/c/src/tests/psxtests/configure.in
@@ -40,6 +40,7 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V)
# Try to explicitly list a Makefile here
AC_OUTPUT(
Makefile
+include/Makefile
psx01/Makefile
psx02/Makefile
psx03/Makefile
@@ -63,6 +64,4 @@ psxsem01/Makefile
psxstat/Makefile
psxtime/Makefile
psxtimer/Makefile
-support/Makefile
-support/include/Makefile
)
diff --git a/c/src/tests/psxtests/support/include/Makefile.am b/c/src/tests/psxtests/include/Makefile.am
index 72f81c8d07..057f4043c1 100644
--- a/c/src/tests/psxtests/support/include/Makefile.am
+++ b/c/src/tests/psxtests/include/Makefile.am
@@ -1,5 +1,5 @@
##
-## $Id$
+## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/tests/psxtests/psx01/Makefile.am b/c/src/tests/psxtests/psx01/Makefile.am
index dcd2e93656..e561c2431d 100644
--- a/c/src/tests/psxtests/psx01/Makefile.am
+++ b/c/src/tests/psxtests/psx01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx02/Makefile.am b/c/src/tests/psxtests/psx02/Makefile.am
index 69cc7f60f1..da671e944e 100644
--- a/c/src/tests/psxtests/psx02/Makefile.am
+++ b/c/src/tests/psxtests/psx02/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx03/Makefile.am b/c/src/tests/psxtests/psx03/Makefile.am
index 84f1a269c1..96b258b129 100644
--- a/c/src/tests/psxtests/psx03/Makefile.am
+++ b/c/src/tests/psxtests/psx03/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx04/Makefile.am b/c/src/tests/psxtests/psx04/Makefile.am
index dd081855ae..99e74f6fec 100644
--- a/c/src/tests/psxtests/psx04/Makefile.am
+++ b/c/src/tests/psxtests/psx04/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx05/Makefile.am b/c/src/tests/psxtests/psx05/Makefile.am
index 1bfc3f3b76..3029fb5e88 100644
--- a/c/src/tests/psxtests/psx05/Makefile.am
+++ b/c/src/tests/psxtests/psx05/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx06/Makefile.am b/c/src/tests/psxtests/psx06/Makefile.am
index de942d089c..72ffe01607 100644
--- a/c/src/tests/psxtests/psx06/Makefile.am
+++ b/c/src/tests/psxtests/psx06/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx07/Makefile.am b/c/src/tests/psxtests/psx07/Makefile.am
index a048a2b237..58acad3a86 100644
--- a/c/src/tests/psxtests/psx07/Makefile.am
+++ b/c/src/tests/psxtests/psx07/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx08/Makefile.am b/c/src/tests/psxtests/psx08/Makefile.am
index d3675e3358..e7349c2ced 100644
--- a/c/src/tests/psxtests/psx08/Makefile.am
+++ b/c/src/tests/psxtests/psx08/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx09/Makefile.am b/c/src/tests/psxtests/psx09/Makefile.am
index ccbe9df6d4..60985a5d25 100644
--- a/c/src/tests/psxtests/psx09/Makefile.am
+++ b/c/src/tests/psxtests/psx09/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx10/Makefile.am b/c/src/tests/psxtests/psx10/Makefile.am
index a47afe80f1..e7d6429399 100644
--- a/c/src/tests/psxtests/psx10/Makefile.am
+++ b/c/src/tests/psxtests/psx10/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx11/Makefile.am b/c/src/tests/psxtests/psx11/Makefile.am
index 2b3cb4580a..4f78bd44be 100644
--- a/c/src/tests/psxtests/psx11/Makefile.am
+++ b/c/src/tests/psxtests/psx11/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psx12/Makefile.am b/c/src/tests/psxtests/psx12/Makefile.am
index 20c7beea6c..c110b5ab58 100644
--- a/c/src/tests/psxtests/psx12/Makefile.am
+++ b/c/src/tests/psxtests/psx12/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am
index e37013b6c4..8f6c75872f 100644
--- a/c/src/tests/psxtests/psxcancel/Makefile.am
+++ b/c/src/tests/psxtests/psxcancel/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am
index 73079c46f1..43d86ae3b5 100644
--- a/c/src/tests/psxtests/psxmsgq01/Makefile.am
+++ b/c/src/tests/psxtests/psxmsgq01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am
index 135514aa14..e0dfae412c 100644
--- a/c/src/tests/psxtests/psxsem01/Makefile.am
+++ b/c/src/tests/psxtests/psxsem01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am
index 8aa00f1d30..66c76cf180 100644
--- a/c/src/tests/psxtests/psxtimer/Makefile.am
+++ b/c/src/tests/psxtests/psxtimer/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)
diff --git a/c/src/tests/psxtests/support/Makefile.am b/c/src/tests/psxtests/support/Makefile.am
deleted file mode 100644
index 45ef0ca4a3..0000000000
--- a/c/src/tests/psxtests/support/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = include
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/tests/psxtests/support/include/pmacros.h b/c/src/tests/psxtests/support/include/pmacros.h
deleted file mode 100644
index 38d0ee1904..0000000000
--- a/c/src/tests/psxtests/support/include/pmacros.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id$
- */
-
-#ifndef __POSIX_TEST_MACROS_h
-#define __POSIX_TEST_MACROS_h
-
-#include <bsp.h>
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-/*
- * These help manipulate the "struct tm" form of time
- */
-
-#define TM_SUNDAY 0
-#define TM_MONDAY 1
-#define TM_TUESDAY 2
-#define TM_WEDNESDAY 3
-#define TM_THURSDAY 4
-#define TM_FRIDAY 5
-#define TM_SATURDAY 6
-
-#define TM_JANUARY 0
-#define TM_FEBRUARY 1
-#define TM_MARCH 2
-#define TM_APRIL 3
-#define TM_MAY 4
-#define TM_JUNE 5
-#define TM_JULY 6
-#define TM_AUGUST 7
-#define TM_SEPTEMBER 8
-#define TM_OCTOBER 10
-#define TM_NOVEMBER 12
-#define TM_DECEMBER 12
-
-#ifndef build_time
-#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
- { (TM)->tm_year = YR; \
- (TM)->tm_mon = MON; \
- (TM)->tm_mday = DAY; \
- (TM)->tm_wday = WEEKDAY; \
- (TM)->tm_hour = HR; \
- (TM)->tm_min = MIN; \
- (TM)->tm_sec = SEC; }
-#endif
-
-#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
- do { \
- struct tm tm; \
- struct timespec tv; \
- int status; \
- \
- build_time( &tm, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ); \
- \
- tv.tv_sec = mktime( &tm ); \
- tv.tv_nsec = 0; \
- assert( tv.tv_sec != -1 ); \
- \
- status = clock_settime( CLOCK_REALTIME, &tv ); \
- assert( !status ); \
- } while ( 0 )
-
-#define print_current_time(s1, s2) \
- do { \
- char _buffer[32]; \
- int _status; \
- struct timespec _tv; \
- \
- _status = clock_gettime( CLOCK_REALTIME, &_tv ); \
- assert( !_status ); \
- \
- (void) ctime_r( &_tv.tv_sec, _buffer ); \
- _buffer[ strlen( _buffer ) - 1 ] = 0; \
- printf( "%s%s%s\n", s1, _buffer, s2 ); \
- fflush(stdout); \
- } while ( 0 )
-
-#define empty_line() puts( "" )
-
-#endif
-
-/* end of file */