Changeset 7948

Timestamp:

Jul 20, 2006, 2:08:15 PM (20 years ago)

Author:

drobbin

Message:

Fixed make fail stemming from psMetadataConfigParse argument and return change to psTimeConvert (test).

Location:

trunk/psLib/test

Files:

• astro/tst_psTime_01.c (modified) (6 diffs)
• types/tap_psMetadataConfigParse.c (modified) (1 diff)

trunk/psLib/test/astro/tst_psTime_01.c

@@ -23 +23 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-06-27 20:33:22 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-07-21 00:08:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -801 +801 @@
     time2 = psTimeConvert(time1,-100);
     // Verify return value is NULL
-    if(time2 != time1) {
+    if(time2 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
         return 2;
@@ -809 +809 @@
     time2 = psTimeConvert(time1,-100);
     // Verify return value is NULL
-    if(time2 != time1) {
+    if(time2 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
         return 2;
@@ -817 +817 @@
     time2 = psTimeConvert(time1,-100);
     // Verify return value is NULL
-    if(time2 != time1) {
+    if(time2 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
         return 2;
@@ -825 +825 @@
     time2 = psTimeConvert(time1,PS_TIME_TAI);
     // Verify return value is NULL
-    if(time2 != time1) {
+    if(time2 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
         return 2;
@@ -1126 +1126 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message converting from UT1");
     time2 = psTimeConvert(time1,PS_TIME_UTC);
-    if(time2 != time1) {
+    if(time2 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from UT1");
         return 23;

trunk/psLib/test/types/tap_psMetadataConfigParse.c

@@ -150 +150 @@
     generateMDConfig();
 
-    int numBadLines = 0;            // Number of bad lines
+    unsigned int numBadLines = 0;            // Number of bad lines
     psMetadata *md = psMetadataConfigParse(NULL, &numBadLines, FILENAME, false);
     ok(md, "md = %x", md);