Changeset a2b3289

Timestamp:

Aug 17, 2009, 9:22:15 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8bce750

Parents:

ecc958e

Message:

tester: Report the test count at the end, not the beginning.

A static test count is just too much effort to maintain correct.

Files:

• filter.c (modified) (1 diff)
• test.h (modified) (1 diff)
• tester.c (modified) (3 diffs)

filter.c

@@ -311 +311 @@
   owl_message_set_attribute(&m, "foo", "bar");
 
-#define TEST_FILTER(f, e) numfailed += owl_filter_test_string(f, &m, e)
-
+#define TEST_FILTER(f, e) do {                          \
+    numtests++;                                         \
+    numfailed += owl_filter_test_string(f, &m, e);      \
+      } while(0)
 
   TEST_FILTER("true", 1);

test.h

@@ -2 +2 @@
 #define __OWL_TEST_H__
 
+extern int numtests;
+
 #define FAIL_UNLESS(desc,pred) do { int __pred = (pred);                \
-    printf("%s %s", (__pred)?"ok":(numfailed++,"not ok"), desc);     \
+    numtests++;                                                         \
+    printf("%s %s", (__pred)?"ok":(numfailed++,"not ok"), desc);        \
     if(!(__pred)) printf("\t(%s:%d)", __FILE__, __LINE__); printf("%c", '\n'); } while(0)
 

tester.c

@@ -5 +5 @@
 owl_global g;
 
-#define OWL_UTIL_NTESTS  9
-#define OWL_DICT_NTESTS  19
-#define OWL_OBARRAY_NTESTS  6
-#define OWL_VARIABLE_NTESTS  36
-#define OWL_FILTER_NTESTS  24
+int numtests;
 
 int main(int argc, char **argv, char **env)
@@ -16 +12 @@
   owl_obarray_init(&(g.obarray));
 
+  numtests = 0;
   int numfailures=0;
-  printf("1..%d\n", OWL_UTIL_NTESTS+OWL_DICT_NTESTS+OWL_VARIABLE_NTESTS
-         +OWL_FILTER_NTESTS+OWL_OBARRAY_NTESTS);
+  /*
+    printf("1..%d\n", OWL_UTIL_NTESTS+OWL_DICT_NTESTS+OWL_VARIABLE_NTESTS
+    +OWL_FILTER_NTESTS+OWL_OBARRAY_NTESTS);
+  */
   numfailures += owl_util_regtest();
   numfailures += owl_dict_regtest();
@@ -27 +26 @@
       fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
   }
+  printf("1..%d\n", numtests);
   return(numfailures);
 }