Changeset 12353

Timestamp:

Mar 8, 2007, 3:37:55 PM (19 years ago)

Author:

jhoblitt

Message:

fix segfault
don't call ok() from inside a loop

File:

• trunk/psLib/test/db/tap_psDB.c (modified) (3 diffs)

trunk/psLib/test/db/tap_psDB.c

@@ -6 +6 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-09 01:32:21 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-09 01:37:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -241 +241 @@
             psU64 rowsAffected = psDBUpdateRows(dbh, "horse", where, value);
             psFree(where);
+
+            ok(rowsAffected, "psDBUpdateRows() - pink -> HOT pink");
+
+            psArray *resultSet = psDBSelectRows(dbh, "horse", value, 0);
             psFree(value);
-
-            ok(rowsAffected, "psDBUpdateRows() - pink -> HOT pink");
-
-            psArray *resultSet = psDBSelectRows(dbh, "horse", value, 0);
 
             for (long i = 0; i < resultSet->n; i++) {
@@ -253 +253 @@
 
                 psMetadataItem  *item;
+                bool test_ok = true;
                 while ((item = psListGetAndIncrement(cursor))) {
                     if (strcmp((char *)item->data.V, "HOT pink") == 0) {
-                        ok(1, "psDBUpdateRows() - psDBSelectRows() found HOT pink");
                         printf("\thorse color is: %s\n", (char *)item->data.V);
+                    } else {
+                        test_ok = false;
                     }
                 }
+                ok(test_ok, "psDBUpdateRows() - psDBSelectRows() found HOT pink");
 
                 psFree(cursor);