301213: Combine internal libpkix function tests into a single statically linked program. r=nelson,julien

6 files changed, 44 insertions, 35 deletions

diff --git a/security/nss/cmd/libpkix/pkix/util/Makefile b/security/nss/cmd/libpkix/pkix/util/Makefile
index 15a060b07..2a760dcd6 100755
--- a/security/nss/cmd/libpkix/pkix/util/Makefile
+++ b/security/nss/cmd/libpkix/pkix/util/Makefile
@@ -46,7 +46,6 @@ include manifest.mn
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
-include $(PKIX_DEPTH)/pkixrules.mk
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
@@ -58,7 +57,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
-include $(PKIX_DEPTH)/pkixlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -77,4 +75,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 include $(PLAT_DEPTH)/platrules.mk
-
diff --git a/security/nss/cmd/libpkix/pkix/util/manifest.mn b/security/nss/cmd/libpkix/pkix/util/manifest.mn
index e8153999e..1725cd0d7 100755
--- a/security/nss/cmd/libpkix/pkix/util/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/util/manifest.mn
@@ -36,6 +36,8 @@
 # ***** END LICENSE BLOCK *****
 
 PKIX_DEPTH = ../..
+PLAT_DEPTH = $(PKIX_DEPTH)/..
+CORE_DEPTH = $(PKIX_DEPTH)/../../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
@@ -46,8 +48,10 @@ CSRCS = test_error.c \
 	test_logger.c \
 	$(NULL)
 
-PROGRAMS = $(CSRCS:.c=)
+LIBRARY_NAME=pkixtoolutil
 
-TARGETS = $(PROGRAMS)
+TARGETS = $(LIBRARY)
+
+SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/util/test_error.c b/security/nss/cmd/libpkix/pkix/util/test_error.c
index 0d88bd240..d01068743 100644
--- a/security/nss/cmd/libpkix/pkix/util/test_error.c
+++ b/security/nss/cmd/libpkix/pkix/util/test_error.c
@@ -44,8 +44,9 @@
 #include "testutil.h"
 #include "testutil_nss.h"
 
-void *plContext = NULL;
+static void *plContext = NULL;
 
+static
 void createErrors(
         PKIX_Error **error,
         PKIX_Error **error2,
@@ -138,6 +139,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
+static
 void testGetErrorCode(PKIX_Error *error, PKIX_Error *error2){
 
         PKIX_UInt32 code;
@@ -171,6 +173,7 @@ cleanup:
 
 }
 
+static
 void testGetDescription(
         PKIX_Error *error,
         PKIX_Error *error2,
@@ -226,6 +229,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
+static
 void testGetCause(PKIX_Error *error, PKIX_Error *error2, PKIX_Error *error3){
 
         PKIX_Error *error4 = NULL;
@@ -275,6 +279,7 @@ cleanup:
 
 }
 
+static
 void testGetSupplementaryInfo(PKIX_Error *error, char *infoChar){
 
         PKIX_PL_Object *targetString = NULL;
@@ -301,7 +306,7 @@ cleanup:
 
 }
 
-void
+static void
 testPrimitiveError(void)
 {
         PKIX_PL_String *targetString = NULL;
@@ -334,7 +339,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testChaining(PKIX_Error *error7)
 {
         PKIX_PL_String *targetString = NULL;
@@ -375,7 +380,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testDestroy(PKIX_Error *error)
 {
         PKIX_TEST_STD_VARS();
@@ -387,7 +392,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-int main(int argc, char *argv[]) {
+int test_error(int argc, char *argv[]) {
 
         PKIX_Error *error, *error2, *error3, *error5, *error6, *error7;
         char *descChar = "Error Message";
diff --git a/security/nss/cmd/libpkix/pkix/util/test_list.c b/security/nss/cmd/libpkix/pkix/util/test_list.c
index 7b5cf08c0..6f97038a8 100644
--- a/security/nss/cmd/libpkix/pkix/util/test_list.c
+++ b/security/nss/cmd/libpkix/pkix/util/test_list.c
@@ -44,9 +44,9 @@
 #include "testutil.h"
 #include "testutil_nss.h"
 
-void *plContext = NULL;
+static void *plContext = NULL;
 
-void
+static void
 createLists(PKIX_List **list, PKIX_List **list2)
 {
         PKIX_TEST_STD_VARS();
@@ -59,7 +59,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testReverseList(void)
 {
         PKIX_List *firstList = NULL;
@@ -176,7 +176,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testZeroLengthList(PKIX_List *list)
 {
         PKIX_UInt32 length;
@@ -257,7 +257,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testGetLength(PKIX_List *list)
 {
         PKIX_UInt32 length;
@@ -275,7 +275,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testGetSetItem(
         PKIX_List *list,
         char *testItemString,
@@ -396,7 +396,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testInsertItem(
         PKIX_List *list,
         PKIX_PL_String *testItem,
@@ -441,7 +441,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testAppendItem(PKIX_List *list, PKIX_PL_String *testItem)
 {
         PKIX_UInt32 length2;
@@ -474,7 +474,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testNestedLists(
         PKIX_List *list,
         PKIX_List *list2,
@@ -533,7 +533,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testDeleteItem(
         PKIX_List *list,
         PKIX_List *list2,
@@ -659,7 +659,7 @@ cleanup:
 
 #if testContainsFunction
 /* This test requires pkix_List_Contains to be in nss.def */
-void
+static void
 testContains(void)
 {
 
@@ -743,7 +743,7 @@ cleanup:
 }
 #endif
 
-void
+static void
 testErrorHandling(void)
 {
         PKIX_List *emptylist = NULL;
@@ -779,7 +779,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testDestroy(PKIX_List *list)
 {
         PKIX_TEST_STD_VARS();
@@ -791,7 +791,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-int main(int argc, char *argv[]) {
+int test_list(int argc, char *argv[]) {
 
         PKIX_List *list, *list2;
         PKIX_PL_String *testItem, *testItem2, *testItem3;
diff --git a/security/nss/cmd/libpkix/pkix/util/test_list2.c b/security/nss/cmd/libpkix/pkix/util/test_list2.c
index 1030413a5..e1df956f5 100644
--- a/security/nss/cmd/libpkix/pkix/util/test_list2.c
+++ b/security/nss/cmd/libpkix/pkix/util/test_list2.c
@@ -44,9 +44,9 @@
 #include "testutil.h"
 #include "testutil_nss.h"
 
-void *plContext = NULL;
+static void *plContext = NULL;
 
-int main(int argc, char *argv[]) {
+int test_list2(int argc, char *argv[]) {
 
         PKIX_List *list;
         char *temp;
diff --git a/security/nss/cmd/libpkix/pkix/util/test_logger.c b/security/nss/cmd/libpkix/pkix/util/test_logger.c
index 7db7df85d..22815cf88 100644
--- a/security/nss/cmd/libpkix/pkix/util/test_logger.c
+++ b/security/nss/cmd/libpkix/pkix/util/test_logger.c
@@ -44,9 +44,9 @@
 #include "testutil.h"
 #include "testutil_nss.h"
 
-void *plContext = NULL;
+static void *plContext = NULL;
 
-char *levels[] = {
+static char *levels[] = {
         "None",
         "Fatal Error",
         "Error",
@@ -55,6 +55,7 @@ char *levels[] = {
         "Trace"
 };
 
+static
 PKIX_Error *testLoggerCallback(
         PKIX_Logger *logger,
         PKIX_PL_String *message,
@@ -85,6 +86,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
+static
 PKIX_Error *testLoggerCallback2(
         PKIX_Logger *logger,
         PKIX_PL_String *message,
@@ -108,7 +110,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 createLogger(PKIX_Logger **logger,
         PKIX_PL_Object *context,
         PKIX_Logger_LogCallback cb)
@@ -123,7 +125,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testContextCallback(PKIX_Logger *logger, PKIX_Logger *logger2)
 {
         PKIX_Logger_LogCallback cb = NULL;
@@ -154,7 +156,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testComponent(PKIX_Logger *logger)
 {
         PKIX_ERRORNUM compName = (PKIX_ERRORNUM)NULL;
@@ -187,7 +189,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testMaxLoggingLevel(PKIX_Logger *logger)
 {
         PKIX_UInt32 level = 0;
@@ -218,7 +220,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-void
+static void
 testLogger(PKIX_Logger *logger, PKIX_Logger *logger2)
 {
         PKIX_List *loggerList = NULL;
@@ -305,7 +307,8 @@ cleanup:
         PKIX_TEST_DECREF_AC(checkList);
         PKIX_TEST_RETURN();
 }
-void
+
+static void
 testDestroy(PKIX_Logger *logger)
 {
         PKIX_TEST_STD_VARS();
@@ -317,7 +320,7 @@ cleanup:
         PKIX_TEST_RETURN();
 }
 
-int main(int argc, char *argv[]) {
+int test_logger(int argc, char *argv[]) {
 
         PKIX_Logger *logger, *logger2;
         PKIX_UInt32 actualMinorVersion;