Changeset 15986 for trunk/psModules/test/config/tap_pmConfigCommand.c

Timestamp:

Jan 2, 2008, 10:49:57 AM (18 years ago)

Author:

gusciora

Message:

Modified file reads to look for dataFiles and then ../dataFiles.

File:

• trunk/psModules/test/config/tap_pmConfigCommand.c (modified) (4 diffs)

trunk/psModules/test/config/tap_pmConfigCommand.c

@@ -5 +5 @@
  * This code will test the pmConfigCommand() routine.
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-18 18:58:52 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:49:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
         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(!pmConfigDatabaseCommand(NULL, config), "pmConfigDatabaseCommand() returned NULL with NULL command input param");
@@ -65 +69 @@
         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");
         char *testCmd = "command";
@@ -82 +90 @@
         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");
         psString testCmd = psStringCopy("my command");