Index: /trunk/psModules/test/config/tst_pmConfig.c
===================================================================
--- /trunk/psModules/test/config/tst_pmConfig.c	(revision 6413)
+++ /trunk/psModules/test/config/tst_pmConfig.c	(revision 6414)
@@ -13,6 +13,8 @@
  * pmConfigDB()
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-08 01:57:44 $
+ * XXXX: Must determine what to do with NULL arguments, then test it.
+ *
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-10 01:41:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,68 +70,71 @@
     psS32 argc = 3;
 
+
     psMetadata *nullMD = NULL;
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL site pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(NULL, &camera, &recipe, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL *site pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&nullMD, &camera, &recipe, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL camera pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&site, NULL, &recipe, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL *camera pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&site, &nullMD, &recipe, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL recipe pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&site, &camera, NULL, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL *recipe pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&site, &camera, &nullMD, &argc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with NULL argv pointer.  Should generate ERROR, return false.\n");
-    rc = pmConfigRead(&site, &camera, &recipe, &argc, NULL, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.\n");
-    psS32 tmpArgc = -1;
-    rc = pmConfigRead(&site, &camera, &recipe, &tmpArgc, str, "RecipeName");
-    if (rc == true) {
-        printf("TEST ERROR: pmConfigRead() returned true\n");
-        testStatus = false;
+    if (0) {
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL site pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(NULL, &camera, &recipe, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL *site pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&nullMD, &camera, &recipe, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL camera pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&site, NULL, &recipe, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL *camera pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&site, &nullMD, &recipe, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL recipe pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&site, &camera, NULL, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL *recipe pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&site, &camera, &nullMD, &argc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with NULL argv pointer.  Should generate ERROR, return false.\n");
+        rc = pmConfigRead(&site, &camera, &recipe, &argc, NULL, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
+
+        printf("----------------------------------------------------------------\n");
+        printf("Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.\n");
+        psS32 tmpArgc = -1;
+        rc = pmConfigRead(&site, &camera, &recipe, &tmpArgc, str, "RecipeName");
+        if (rc == true) {
+            printf("TEST ERROR: pmConfigRead() returned true\n");
+            testStatus = false;
+        }
     }
 
Index: /trunk/psModules/test/config/verified/tst_pmConfig.stderr
===================================================================
--- /trunk/psModules/test/config/verified/tst_pmConfig.stderr	(revision 6413)
+++ /trunk/psModules/test/config/verified/tst_pmConfig.stderr	(revision 6414)
@@ -5,20 +5,4 @@
 \**********************************************************************************/
 
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: site is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: *site is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: camera is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: *camera is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: recipe is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: *recipe is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Unallowable operation: argv is NULL.
-<HOST>|E|pmConfigRead (FILE:LINENO)
-    Error: *argc is 0 or less.
 <HOST>|I|readConfig
     Loading site configuration from file SampleIPPConfig
Index: /trunk/psModules/test/config/verified/tst_pmConfig.stdout
===================================================================
--- /trunk/psModules/test/config/verified/tst_pmConfig.stdout	(revision 6413)
+++ /trunk/psModules/test/config/verified/tst_pmConfig.stdout	(revision 6414)
@@ -1,18 +1,2 @@
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL site pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL *site pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL camera pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL *camera pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL recipe pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL *recipe pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with NULL argv pointer.  Should generate ERROR, return false.
-----------------------------------------------------------------
-Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.
 ----------------------------------------------------------------
 Calling pmConfigRead() with acceptable arguments.