Changeset 5222

Timestamp:

Oct 3, 2005, 3:31:40 PM (21 years ago)

Author:

drobbin

Message:

Added testing for psArgument functions and updated some psTime (minor changes).

Location:

trunk/psLib

Files:

• pslib.kdevelop (modified) (3 diffs)
• src/astro/psTime.c (modified) (2 diffs)
• src/mathtypes/psVector.c (modified) (3 diffs)
• test/types/tst_psMetadata_07.c (modified) (4 diffs)
• test/types/verified/tst_psMetadata_07.stdout (modified) (1 diff)

trunk/psLib/pslib.kdevelop

@@ -14 +14 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <secondaryLanguages/>
   </general>
@@ -49 +49 @@
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
       </envvars>
-      <abortonerror>false</abortonerror>
-      <numberofjobs>3</numberofjobs>
-      <dontact>false</dontact>
-      <makebin></makebin>
-      <prio>0</prio>
     </make>
   </kdevautoproject>
@@ -174 +169 @@
   <kdevdebugger>
     <general>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
+      <programargs/>
+      <gdbpath/>
       <dbgshell>libtool</dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-26 21:13:12 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-04 01:31:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -486 +486 @@
 
     // Get the system time
-    if (gettimeofday(&now, (struct timezone *)0) == -1) {
+    //    if (gettimeofday(&now, (struct timezone *)0) == -1) {
+    if (gettimeofday(&now, 0) == -1) {
         psError(PS_ERR_OS_CALL_FAILED, true,
                 PS_ERRORTEXT_psTime_GET_TOD_FAILED);

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-30 23:09:13 $
+*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-04 01:31:40 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include <stdio.h>
 #include <math.h>
+#include <unistd.h>
 
 #include "psMemory.h"
@@ -603 +604 @@
                       char *name)
 {
-    /*
-        XXXX: This is seg faulting.  So I'm getting rid of it.
-        FILE *f;
-        f = fdopen(fd, "a+");
-        fprintf (f, "vector: %s\n", name);
-
-        for (int i = 0; i < a[0].n; i++) {
-            fprintf (f, "%f\n", p_psVectorGetElementF64(a, i));
-        }
-        fprintf (f, "\n");
-    // XXXX: temp fix: this should be recoded.
-    //    fclose(f);
-        return (true);
-    */
-
-    printf ("vector: %s\n", name);
+    char line[1024];
+
+    sprintf (line, "vector: %s\n", name);
+    write (fd, line, strlen(line));
+
     for (int i = 0; i < a[0].n; i++) {
-        printf("%f\n", p_psVectorGetElementF64(a, i));
-    }
-    printf("\n");
-    fflush(stdout);
+        sprintf (line, "%f\n", p_psVectorGetElementF64(a, i));
+        write (fd, line, strlen(line));
+    }
+    sprintf (line, "\n");
+    write (fd, line, strlen(line));
     return (true);
 }

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -14 +14 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-30 01:34:45 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-10-04 01:31:40 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 static psS32 testMetaRemove(void);
 static psS32 testMetaAddPtr(void);
+static psS32 testArgument(void);
 
 testDescription tests[] = {
@@ -35 +36 @@
                               {testMetaRemove, 0, "Test psMetadataRemoveKey/Index", 0, false},
                               {testMetaAddPtr, 0, "Test psMetadataAddPtr", 0, false},
+                              {testArgument, 0, "Test psArgument fxns", 0, false},
                               {NULL}
                           };
@@ -221 +223 @@
 
 }
+
+psS32 testArgument(void)
+{
+    char *argv[6];
+    argv[0] = "./program";
+    argv[1] = "-string";
+    argv[2] = "new";
+    argv[3] = "-float";
+    argv[4] = "6.66";
+    argv[5] = "-vvv";
+    int argc = 6;
+
+    int i = psArgumentGet(argc, argv, "-float");
+    if ( i != 0 ) {
+        if ( !psArgumentRemove(i, &argc, argv) ) {
+            printf("\n Failed to remove string from argument list\n");
+        }
+    } else {
+        printf("\nFailed to find string in argument list\n");
+    }
+    psArgumentRemove(i, &argc, argv);
+    printf("\n Argument %d has been removed", i);
+    int log = psArgumentVerbosity(&argc, argv);
+    printf("\nLog level = %d \n", log);
+
+    psMetadata *args = psMetadataAlloc();
+    psMetadataAdd(args, PS_LIST_TAIL, "-string", PS_DATA_STRING, "Test String", "SomeString");
+    psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_S32 | PS_META_DUPLICATE_OK, "Int1", 1);
+    psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_S32 | PS_META_DUPLICATE_OK, "Int2", 2);
+    psMetadataAdd(args, PS_LIST_TAIL, "-float", PS_DATA_F32, "Test Float", 6);
+
+    if ( !psArgumentParse(args, &argc, argv) || argc != 1 ) {
+        psArgumentHelp(args);
+        psFree(args);
+        return 0;
+    }
+
+    psMetadataPrint(args, 4);
+
+    psFree(args);
+    return 0;
+}
+

trunk/psLib/test/types/verified/tst_psMetadata_07.stdout

@@ -44 +44 @@
 ---> TESTPOINT PASSED (psMetadata{Test E - psMetadataConfigWrite} | tst_psMetadata_07.c)
 
+
+ Argument 3 has been removed
+Log level = 5 
+Updating -string
+    -string (Test String): new
+    -int (Int1): 1
+    -int (Int2): 2
+    -float (Test Float): 0.000000