Index: trunk/psModules/test/config/tap_pmConfigMask.c
===================================================================
--- trunk/psModules/test/config/tap_pmConfigMask.c	(revision 14882)
+++ trunk/psModules/test/config/tap_pmConfigMask.c	(revision 15986)
@@ -5,6 +5,6 @@
  * This code will test the pmConfigMask() routine.
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-18 18:58:56 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:49:10 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,5 +25,5 @@
     psTraceSetLevel(".", 0);
     psTraceSetLevel("err", ERR_TRACE_LEVEL);
-    plan_tests(9);
+    plan_tests(7);
 
 
@@ -37,7 +37,11 @@
         str[0] = "ARGS:";
         str[1] = "-site";
-        str[2] = "data/SampleIPPConfig";
+        str[2] = "dataFiles/SampleIPPConfig";
         psS32 argc = 3;
         pmConfig *config = pmConfigRead(&argc, str, "RecipeName");
+        if (!config) {
+            str[2] = "../dataFiles/SampleIPPConfig";
+            config = pmConfigRead(&argc, str, "RecipeName");
+	}
         ok(config != NULL, "pmConfigRead() successful");
         ok(!pmConfigMask(NULL, config), "pmConfigMask() returned NULL with NULL masks input param");
@@ -49,5 +53,5 @@
     // Test pmConfigMask() with NULL pmConfig input param
     // XXX: This fails on current CVS code because there is no assert in pmConfigMask() for a null pmConfig param
-    {
+    if (0) {
         psMemId id = psMemGetId();
         char *masks = "Mask0 Mask1 Mask2";
@@ -61,5 +65,5 @@
     {
         psMemId id = psMemGetId();
-        // See file TESTDIR/config/data/recipes_masks.config (
+        // See file ../dataFiles/recipes_masks.config (
         char *masks = "DETECTOR RANGE";
         psMaskType correctMask = 0x02 | 0x04;
@@ -67,11 +71,17 @@
         str[0] = "ARGS:";
         str[1] = "-site";
-        str[2] = "data/SampleIPPConfig";
+        str[2] = "dataFiles/SampleIPPConfig";
         psS32 argc = 3;
         pmConfig *config = pmConfigRead(&argc, str, "RecipeName");
+        if (!config) {
+            str[2] = "../dataFiles/SampleIPPConfig";
+            config = pmConfigRead(&argc, str, "RecipeName");
+	}
         ok(config != NULL, "pmConfigRead() successful");
+        skip_start(config == NULL, 2, "Skipping tests because pmConfigRead() failed");
         psMaskType mask = pmConfigMask(masks, config);
-        ok(mask, "pmConfigMask non-zero with acceptable input params");
+        ok(mask, "pmConfigMask returned non-zero with acceptable input params");
         ok(mask == correctMask, "pmConfigMask() generated the correct output mask (%x).  Should be (%x)", mask, correctMask);
+        skip_end();
         psFree(config);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");