added echod / sokcperf to NetWare test build.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@822055 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 510 insertions, 2 deletions

diff --git a/test/NWGNUechod b/test/NWGNUechod
new file mode 100644
index 000000000..c05f016ae
--- /dev/null
+++ b/test/NWGNUechod
@@ -0,0 +1,253 @@
+#

+# Make sure all needed macro's are defined

+#

+

+#

+# Get the 'head' of the build environment if necessary.  This includes default

+# targets and paths to tools

+#

+

+ifndef EnvironmentDefined

+include $(APR_WORK)/build/NWGNUhead.inc

+endif

+

+#

+# These directories will be at the beginning of the include list, followed by

+# INCDIRS

+#

+XINCDIRS	+= \

+			$(APR)/include \

+			$(APR)/include/arch/NetWare \

+			$(EOLIST)

+

+#

+# These flags will come after CFLAGS

+#

+XCFLAGS		+= \

+			$(EOLIST)

+

+#

+# These defines will come after DEFINES

+#

+XDEFINES	+= \

+			$(EOLIST)

+

+#

+# These flags will be added to the link.opt file

+#

+XLFLAGS		+= \

+			$(EOLIST)

+

+#

+# These values will be appended to the correct variables based on the value of

+# RELEASE

+#

+ifeq "$(RELEASE)" "debug"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+ifeq "$(RELEASE)" "noopt"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+ifeq "$(RELEASE)" "release"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+#

+# These are used by the link target if an NLM is being generated

+# This is used by the link 'name' directive to name the nlm.  If left blank

+# TARGET_nlm (see below) will be used.

+#

+NLM_NAME	= echod

+

+#

+# This is used by the link '-desc ' directive. 

+# If left blank, NLM_NAME will be used.

+#

+NLM_DESCRIPTION	= Echo Daemon NLM to test socket performance

+

+#

+# This is used by the '-threadname' directive.  If left blank,

+# NLM_NAME Thread will be used.

+#

+NLM_THREAD_NAME	= $(NLM_NAME)

+

+#

+# This is used by the '-screenname' directive.  If left blank,

+# 'Apache for NetWare' Thread will be used.

+#

+NLM_SCREEN_NAME = $(NLM_NAME)

+

+#

+# If this is specified, it will override VERSION value in 

+# $(APR_WORK)/build/NWGNUenvironment.inc

+#

+NLM_VERSION	=

+

+#

+# If this is specified, it will override the default of 64K

+#

+NLM_STACK_SIZE	= 

+

+#

+# If this is specified it will be used by the link '-entry' directive

+#

+NLM_ENTRY_SYM	= _LibCPrelude

+

+#

+# If this is specified it will be used by the link '-exit' directive

+#

+NLM_EXIT_SYM	= _LibCPostlude

+

+#

+# If this is specified it will be used by the link '-check' directive

+#

+NLM_CHECK_SYM	=

+

+#

+# If this is specified it will be used by the link '-flags' directive

+#

+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE

+ 

+#

+# If this is specified it will be linked in with the XDCData option in the def 

+# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 

+# be disabled by setting APACHE_UNIPROC in the environment

+#

+XDCDATA		= 

+

+#

+# Declare all target files (you must add your files here)

+#

+

+#

+# If there is an NLM target, put it here

+#

+TARGET_nlm = \

+	$(OBJDIR)/$(NLM_NAME).nlm \

+	$(EOLIST)

+

+#

+# If there is an LIB target, put it here

+#

+TARGET_lib = \

+	$(EOLIST)

+

+#

+# These are the OBJ files needed to create the NLM target above.

+# Paths must all use the '/' character

+#

+FILES_nlm_objs = \

+	$(OBJDIR)/$(NLM_NAME).o \

+	$(OBJDIR)/nw_misc.o \

+	$(EOLIST)

+

+#

+# These are the LIB files needed to create the NLM target above.

+# These will be added as a library command in the link.opt file.

+#

+FILES_nlm_libs = \

+	libcpre.o \

+	$(EOLIST)

+

+#

+# These are the modules that the above NLM target depends on to load.

+# These will be added as a module command in the link.opt file.

+#

+FILES_nlm_modules = \

+	aprlib \

+	Libc \

+	$(EOLIST)

+

+#

+# If the nlm has a msg file, put it's path here

+#

+FILE_nlm_msg =

+ 

+#

+# If the nlm has a hlp file put it's path here

+#

+FILE_nlm_hlp =

+

+#

+# If this is specified, it will override the default copyright.

+#

+FILE_nlm_copyright =

+

+#

+# Any additional imports go here

+#

+FILES_nlm_Ximports = \

+	@$(APR)/aprlib.imp \

+	@libc.imp \

+	$(EOLIST)

+ 

+#   

+# Any symbols exported to here

+#

+FILES_nlm_exports = \

+	$(EOLIST)

+

+#   

+# These are the OBJ files needed to create the LIB target above.

+# Paths must all use the '/' character

+#

+FILES_lib_objs = \

+	$(EOLIST)

+

+#

+# implement targets and dependancies (leave this section alone)

+#

+

+libs :: $(OBJDIR) $(TARGET_lib)

+

+nlms :: libs $(TARGET_nlm)

+

+#

+# Updated this target to create necessary directories and copy files to the 

+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)

+#

+install :: nlms FORCE

+

+#

+# Any specialized rules here

+#

+

+#

+# Include the 'tail' makefile that has targets that depend on variables defined

+# in this makefile

+#

+

+include $(APR_WORK)/build/NWGNUtail.inc

+

diff --git a/test/NWGNUmakefile b/test/NWGNUmakefile
index fac4aaa47..d2f8b0ce5 100644
--- a/test/NWGNUmakefile
+++ b/test/NWGNUmakefile
@@ -20,13 +20,15 @@ include $(APR_WORK)\build\NWGNUhead.inc
 #
 TARGET_nlm = \
 	$(OBJDIR)/aprtest.nlm \
+	$(OBJDIR)/echod.nlm \
+	$(OBJDIR)/globalmutexchild.nlm \
 	$(OBJDIR)/mod_test.nlm \
 	$(OBJDIR)/proc_child.nlm \
 	$(OBJDIR)/readchild.nlm \
-	$(OBJDIR)/globalmutexchild.nlm \
 	$(OBJDIR)/sockchild.nlm \
-	$(OBJDIR)/tryread.nlm \
+	$(OBJDIR)/sockperf.nlm \
 	$(OBJDIR)/testatmc.nlm \
+	$(OBJDIR)/tryread.nlm \
 	$(EOLIST)
 
 #
diff --git a/test/NWGNUsockperf b/test/NWGNUsockperf
new file mode 100644
index 000000000..82baa6bd6
--- /dev/null
+++ b/test/NWGNUsockperf
@@ -0,0 +1,253 @@
+#

+# Make sure all needed macro's are defined

+#

+

+#

+# Get the 'head' of the build environment if necessary.  This includes default

+# targets and paths to tools

+#

+

+ifndef EnvironmentDefined

+include $(APR_WORK)/build/NWGNUhead.inc

+endif

+

+#

+# These directories will be at the beginning of the include list, followed by

+# INCDIRS

+#

+XINCDIRS	+= \

+			$(APR)/include \

+			$(APR)/include/arch/NetWare \

+			$(EOLIST)

+

+#

+# These flags will come after CFLAGS

+#

+XCFLAGS		+= \

+			$(EOLIST)

+

+#

+# These defines will come after DEFINES

+#

+XDEFINES	+= \

+			$(EOLIST)

+

+#

+# These flags will be added to the link.opt file

+#

+XLFLAGS		+= \

+			$(EOLIST)

+

+#

+# These values will be appended to the correct variables based on the value of

+# RELEASE

+#

+ifeq "$(RELEASE)" "debug"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+ifeq "$(RELEASE)" "noopt"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+ifeq "$(RELEASE)" "release"

+XINCDIRS	+= \

+			$(EOLIST)

+

+XCFLAGS		+= \

+			$(EOLIST)

+

+XDEFINES	+= \

+			$(EOLIST)

+

+XLFLAGS		+= \

+			$(EOLIST)

+endif

+

+#

+# These are used by the link target if an NLM is being generated

+# This is used by the link 'name' directive to name the nlm.  If left blank

+# TARGET_nlm (see below) will be used.

+#

+NLM_NAME	= sockperf

+

+#

+# This is used by the link '-desc ' directive. 

+# If left blank, NLM_NAME will be used.

+#

+NLM_DESCRIPTION	= socket NLM to test socket performance

+

+#

+# This is used by the '-threadname' directive.  If left blank,

+# NLM_NAME Thread will be used.

+#

+NLM_THREAD_NAME	= $(NLM_NAME)

+

+#

+# This is used by the '-screenname' directive.  If left blank,

+# 'Apache for NetWare' Thread will be used.

+#

+NLM_SCREEN_NAME = $(NLM_NAME)

+

+#

+# If this is specified, it will override VERSION value in 

+# $(APR_WORK)/build/NWGNUenvironment.inc

+#

+NLM_VERSION	=

+

+#

+# If this is specified, it will override the default of 64K

+#

+NLM_STACK_SIZE	= 

+

+#

+# If this is specified it will be used by the link '-entry' directive

+#

+NLM_ENTRY_SYM	= _LibCPrelude

+

+#

+# If this is specified it will be used by the link '-exit' directive

+#

+NLM_EXIT_SYM	= _LibCPostlude

+

+#

+# If this is specified it will be used by the link '-check' directive

+#

+NLM_CHECK_SYM	=

+

+#

+# If this is specified it will be used by the link '-flags' directive

+#

+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE

+ 

+#

+# If this is specified it will be linked in with the XDCData option in the def 

+# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 

+# be disabled by setting APACHE_UNIPROC in the environment

+#

+XDCDATA		= 

+

+#

+# Declare all target files (you must add your files here)

+#

+

+#

+# If there is an NLM target, put it here

+#

+TARGET_nlm = \

+	$(OBJDIR)/$(NLM_NAME).nlm \

+	$(EOLIST)

+

+#

+# If there is an LIB target, put it here

+#

+TARGET_lib = \

+	$(EOLIST)

+

+#

+# These are the OBJ files needed to create the NLM target above.

+# Paths must all use the '/' character

+#

+FILES_nlm_objs = \

+	$(OBJDIR)/$(NLM_NAME).o \

+	$(OBJDIR)/nw_misc.o \

+	$(EOLIST)

+

+#

+# These are the LIB files needed to create the NLM target above.

+# These will be added as a library command in the link.opt file.

+#

+FILES_nlm_libs = \

+	libcpre.o \

+	$(EOLIST)

+

+#

+# These are the modules that the above NLM target depends on to load.

+# These will be added as a module command in the link.opt file.

+#

+FILES_nlm_modules = \

+	aprlib \

+	Libc \

+	$(EOLIST)

+

+#

+# If the nlm has a msg file, put it's path here

+#

+FILE_nlm_msg =

+ 

+#

+# If the nlm has a hlp file put it's path here

+#

+FILE_nlm_hlp =

+

+#

+# If this is specified, it will override the default copyright.

+#

+FILE_nlm_copyright =

+

+#

+# Any additional imports go here

+#

+FILES_nlm_Ximports = \

+	@$(APR)/aprlib.imp \

+	@libc.imp \

+	$(EOLIST)

+ 

+#   

+# Any symbols exported to here

+#

+FILES_nlm_exports = \

+	$(EOLIST)

+

+#   

+# These are the OBJ files needed to create the LIB target above.

+# Paths must all use the '/' character

+#

+FILES_lib_objs = \

+	$(EOLIST)

+

+#

+# implement targets and dependancies (leave this section alone)

+#

+

+libs :: $(OBJDIR) $(TARGET_lib)

+

+nlms :: libs $(TARGET_nlm)

+

+#

+# Updated this target to create necessary directories and copy files to the 

+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)

+#

+install :: nlms FORCE

+

+#

+# Any specialized rules here

+#

+

+#

+# Include the 'tail' makefile that has targets that depend on variables defined

+# in this makefile

+#

+

+include $(APR_WORK)/build/NWGNUtail.inc

+