summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-08 20:18:10 +0000
committerjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-08 20:18:10 +0000
commit7acbeef100513b8cd110e04ccd7fcecf8742f6da (patch)
tree6f5e8604ccec1430ea78b1a06902c8d73fd0534b
parent647ffdce5b22631467a3f62f1bc2acc053437d57 (diff)
downloadATCD-7acbeef100513b8cd110e04ccd7fcecf8742f6da.tar.gz
Adding new test for POSIX_SINGLE_PROCESS unit of functionality and updating
Makefile for changes to the PACE library directory structure.
-rw-r--r--PACE/tests/Makefile38
-rw-r--r--PACE/tests/Posix_SP_Test.c2
2 files changed, 35 insertions, 5 deletions
diff --git a/PACE/tests/Makefile b/PACE/tests/Makefile
index c632b0e1a32..e1814da21af 100644
--- a/PACE/tests/Makefile
+++ b/PACE/tests/Makefile
@@ -9,6 +9,36 @@ ifndef PACE_ROOT
PACE_ROOT = $(ACE_ROOT)/pace
endif # ! PACE_ROOT
+ifeq ($(PACE_SYSNAME),)
+ PACE_SYSNAME = $(shell uname -s)
+endif # ! PACE_SYSNAME
+
+VPATH:=common:arpa:config:netinet:sys
+INCLDIRS = -I$(PACE_ROOT)
+
+# List of platforms and uname -s values
+# =====================================
+# Solaris SunOS
+# NT "NT" (uname not supported)
+# LynxOS LynxOS
+# VxWorks "VxWorks" (strictly cross-compiled)
+# Linux Linux
+# pSOS "pSOS" (strictly cross-compiled)
+# Chorus "Chorus" (strictly cross-compiled)
+# QNX Neutrino "Neutrino" (strictly cross-compiled)
+# OSF/1 OSF1
+# IRIX (64 bit) IRIX64
+# IRIX (32 bit) IRIX (unconfirmed)
+# HPUX HP-UX
+
+# Solaris is POSIX - change this when the platform directories get
+# squared away
+#ifeq ($(PACE_SYSNAME),SunOS || $(PACE_SYSNAME),Linux)
+ifeq ($(PACE_SYSNAME),SunOS)
+VPATH :=.:posix:$(VPATH)
+INCLDIRS += -I$(PACE_ROOT)/pace/posix
+endif
+
#----------------------------------------------------------------------------
# Local macros
#----------------------------------------------------------------------------
@@ -34,7 +64,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
#INCLDIRS += -I$(PACE_ROOT)
-INCLDIRS = -I$(PACE_ROOT)
+#INCLDIRS = -I$(PACE_ROOT)
#LDFLAGS += -L$(PACE_ROOT)/pace -lPACE
#LDFLAGS = -L$(PACE_ROOT)/pace -lPACE
@@ -42,9 +72,7 @@ INCLDIRS = -I$(PACE_ROOT)
#LDFLAGS =
#VLDLIBS -= -L$(ACE_ROOT)/ace -lACE
#VLDLIBS = -L$(PACE_ROOT)/pace -lPACE
-VLDLIBS =
-
-ACELIB=
+VLDLIBS = -lposix4
ifndef SOEXT
SOEXT=so
@@ -52,6 +80,8 @@ endif
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+ACELIB =
+
# To build multiple executables in the same directory on AIX, it works
# best to wipe out any previously-created tempinc directory.
# The compiler/linker isn't too smart about instantiating templates...
diff --git a/PACE/tests/Posix_SP_Test.c b/PACE/tests/Posix_SP_Test.c
index 347528951a1..efb47edbfe3 100644
--- a/PACE/tests/Posix_SP_Test.c
+++ b/PACE/tests/Posix_SP_Test.c
@@ -32,7 +32,7 @@ main (int argc, char **argv)
{
long retval;
time_t local_time;
- utsname name;
+ struct utsname name;
/* Call pace_sysconf() */
retval = pace_sysconf(_SC_2_C_BIND);