Bugscape bug 57081: If the make variable NISCC_TEST is defined at build

time, add -DNISCC_TEST to the compile command line.  The NISCC_TEST macro
enables special code that's conditionally compiled for NISCC testing.
Modified Files:
	cmd/smimetools/Makefile cmd/smimetools/cmsutil.c
	lib/ssl/config.mk lib/ssl/manifest.mn

security/nss/cmd/smimetools/Makefile

@@ -58,6 +58,10 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include ../platlibs.mk
 
+ifdef NISCC_TEST
+DEFINES += -DNISCC_TEST
+endif
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################

security/nss/cmd/smimetools/cmsutil.c

@@ -37,7 +37,7 @@
 /*
  * cmsutil -- A command to work with CMS data
  *
- * $Id: cmsutil.c,v 1.49 2004-04-25 15:02:55 gerv%gerv.net Exp $
+ * $Id: cmsutil.c,v 1.50 2004-05-13 01:29:15 wchang0222%aol.com Exp $
  */
 
 #include "nspr.h"
@@ -1088,7 +1088,7 @@ main(int argc, char **argv)
     PRFileDesc *contentFile = NULL;
     PRBool      batch = PR_FALSE;
 
-#ifdef NISCC_TESTING
+#ifdef NISCC_TEST
     const char *ev = PR_GetEnv("NSS_DISABLE_ARENA_FREE_LIST");
     PORT_Assert(ev); 
     ev = PR_GetEnv("NSS_STRICT_SHUTDOWN");

security/nss/lib/ssl/config.mk

@@ -35,6 +35,10 @@
 #
 # ***** END LICENSE BLOCK *****
 
+ifdef NISCC_TEST
+DEFINES += -DNISCC_TEST
+endif
+
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name

security/nss/lib/ssl/manifest.mn

@@ -36,7 +36,7 @@
 # ***** END LICENSE BLOCK *****
 CORE_DEPTH = ../../..
 
-# DEFINES = -DTRACE -DNISCC_TEST 
+# DEFINES = -DTRACE
 
 PRIVATE_EXPORTS = \
 	ssl3prot.h \