Changeset 2808

Timestamp:

Dec 23, 2004, 9:38:38 AM (22 years ago)

Author:

desonia

Message:

fixed some small problems with running tests on AMD64.

Location:

trunk/psLib/test

Files:

• astronomy/tst_psTime_03.c (modified) (6 diffs)
• dataIO/tst_psLookupTable_01.c (modified) (2 diffs)
• fileUtils/tst_psLookupTable_01.c (modified) (2 diffs)

trunk/psLib/test/astronomy/tst_psTime_03.c

@@ -18 +18 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-12-17 20:48:47 $
+ *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-12-23 19:38:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
     timeOut1 = psTimeMath(time1a, time1b);
     if(timeOut1->sec!=2 && timeOut1->usec!=222222) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",timeOut1->sec, timeOut1->usec);
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",(long long int)timeOut1->sec, timeOut1->usec);
     }
     printFooter(stdout, "psTime", "Test A - Add two times", true);
@@ -59 +59 @@
     timeOut2 = psTimeMath(time2a, time2b);
     if(timeOut2->sec!=12 && timeOut2->usec!=100002) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 12:100002\n",timeOut2->sec, timeOut2->usec);
+        printf("ERROR: Incorrect time, %lld:%u. Expected 12:100002\n",(long long int)timeOut2->sec, timeOut2->usec);
     }
     printFooter(stdout, "psTime", "Test B - Add two times with overflow in microseconds", true);
@@ -74 +74 @@
     timeOut3 = psTimeMath(time3a, time3b);
     if(timeOut3->sec!=2 && timeOut3->usec!=222222) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",timeOut3->sec, timeOut3->usec);
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:222222\n",(long long int)timeOut3->sec, timeOut3->usec);
     }
     printFooter(stdout, "psTime", "Test C - Subtract two times", true);
@@ -89 +89 @@
     timeOut4 = psTimeMath(time4a, time4b);
     if(timeOut4->sec!=2 && timeOut4->usec!=999997) {
-        printf("ERROR: Incorrect time, %lld:%u. Expected 2:999997\n",timeOut4->sec, timeOut4->usec);
+        printf("ERROR: Incorrect time, %lld:%u. Expected 2:999997\n",(long long int)timeOut4->sec, timeOut4->usec);
     }
     printFooter(stdout, "psTime", "Test D - Subtact two times with underflow in microseconds", true);
@@ -152 +152 @@
     time8b = psTimeFromISOTime("1972-1-1T1:00:00.00");
     out = psTimeLeapseconds(time8a, time8b);
-    printf("%lld\n", out);
+    printf("%lld\n", (long long int)out);
     printFooter(stdout, "psTime", "Test H - Find number of leapseconds added between two times", true);
 

trunk/psLib/test/dataIO/tst_psLookupTable_01.c

@@ -12 +12 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-13 22:32:02 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-23 19:38:38 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
             printf("ERROR: Incorrect value, %lf. Expected %lf\n", out2->data.F64[i], truthData2[i]);
         } else if(status1 != PS_LOOKUP_SUCCESS) {
-            printf("ERROR: Bad return status, %d for column %lld\n", stats2->data.U32[i], i);
+            printf("ERROR: Bad return status, %d for column %lld\n", stats2->data.U32[i], (long long int)i);
         }
     }

trunk/psLib/test/fileUtils/tst_psLookupTable_01.c

@@ -12 +12 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-13 22:32:02 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-23 19:38:38 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
             printf("ERROR: Incorrect value, %lf. Expected %lf\n", out2->data.F64[i], truthData2[i]);
         } else if(status1 != PS_LOOKUP_SUCCESS) {
-            printf("ERROR: Bad return status, %d for column %lld\n", stats2->data.U32[i], i);
+            printf("ERROR: Bad return status, %d for column %lld\n", stats2->data.U32[i], (long long int)i);
         }
     }