Tag 0.9.190.9.19

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/tags/0.9.19@1006155 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 33 insertions, 38 deletions

diff --git a/test/nwgnuaprtest b/test/NWGNUaprtest
index e3a71c83d..76d1ca4c5 100644
--- a/test/nwgnuaprtest
+++ b/test/NWGNUaprtest
@@ -89,7 +89,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=aprtest
+NLM_NAME	= aprtest
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
@@ -100,19 +100,19 @@ NLM_DESCRIPTION	=  NLM is to test the apr layer
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= aprtest
+NLM_THREAD_NAME	= $(NLM_NAME) Thread
 
 #
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-NLM_SCREEN_NAME = aprtest
+NLM_SCREEN_NAME = $(NLM_NAME)
 
 #
 # If this is specified, it will override VERSION value in 
 # $(APR_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +137,14 @@ NLM_CHECK_SYM	=
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # 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         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -168,7 +168,7 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/cutest.o \
+	$(OBJDIR)/CuTest.o \
 	$(OBJDIR)/testall.o \
 	$(OBJDIR)/testargs.o \
 	$(OBJDIR)/testdir.o \
@@ -243,7 +243,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@$(APR)/aprlib.imp \
 	$(EOLIST)
  
 #   
@@ -251,7 +251,7 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
diff --git a/test/nwgnumod_test b/test/NWGNUmod_test
index 1510ccb52..a454ef0c5 100644
--- a/test/nwgnumod_test
+++ b/test/NWGNUmod_test
@@ -54,7 +54,6 @@ XDEFINES	+= \
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@ XDEFINES	+= \
 
 XLFLAGS		+= \
 			$(EOLIST)
-
-			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,7 +89,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	mod_test
+NLM_NAME	= mod_test
 
 #
 # This is used by the link '-desc ' directive. 
@@ -104,7 +101,7 @@ NLM_DESCRIPTION	=  DSO NLM to test the apr DSO loading layer
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= mod_test
+NLM_THREAD_NAME	= $(NLM_NAME) Thread
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT
 # If this is specified, it will override VERSION value in 
 # $(APR_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@ NLM_CHECK_SYM	=
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # 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         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -222,7 +219,7 @@ FILES_nlm_exports = \
 	print_hello \
 	count_reps \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
diff --git a/test/nwgnuproc_child b/test/NWGNUproc_child
index 51cffff21..090bbddfa 100644
--- a/test/nwgnuproc_child
+++ b/test/NWGNUproc_child
@@ -54,7 +54,6 @@ XDEFINES	+= \
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@ XDEFINES	+= \
 
 XLFLAGS		+= \
 			$(EOLIST)
-
-			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,19 +89,19 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	proc_child
+NLM_NAME	= proc_child
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  child NLM to test the proc layer
+NLM_DESCRIPTION	= child NLM to test the proc layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= proc_child
+NLM_THREAD_NAME	= $(NLM_NAME) Thread
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT
 # If this is specified, it will override VERSION value in 
 # $(APR_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@ NLM_CHECK_SYM	=
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+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         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -220,7 +217,7 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
diff --git a/test/nwgnutestatmc b/test/NWGNUtestatmc
index afe1aaf21..e24bf36a7 100644
--- a/test/nwgnutestatmc
+++ b/test/NWGNUtestatmc
@@ -89,30 +89,30 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=testatmc
+NLM_NAME	= testatmc
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  NLM is to test the atomic functions
+NLM_DESCRIPTION	= NLM is to test the atomic functions
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= testatmc
+NLM_THREAD_NAME	= $(NLM_NAME) Thread
 
 #
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-NLM_SCREEN_NAME = testatmc
+NLM_SCREEN_NAME = $(NLM_NAME)
 
 #
 # If this is specified, it will override VERSION value in 
 # $(APR_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +137,14 @@ NLM_CHECK_SYM	=
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # 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         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -173,7 +173,7 @@ FILES_nlm_objs = \
 	$(EOLIST)
 
 # Pending tests
-	
+
 #
 # 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.
@@ -211,7 +211,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@$(APR)/aprlib.imp \
 	$(EOLIST)
  
 #   
@@ -219,7 +219,7 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
diff --git a/test/nw_misc.c b/test/nw_misc.c
index aa211ea9f..2f6709358 100644
--- a/test/nw_misc.c
+++ b/test/nw_misc.c
@@ -4,6 +4,7 @@
 
 void _NonAppStop( void )
 {
+  if (getenv("_IN_NETWARE_BASH_") == NULL)
     pressanykey();
 }