Fix missing [un]collectable_count increments in gctest

* tests/test.c [!DBG_HDRS_ALL] (run_one_test): Increment
uncollectable_count instead of collectable_count (for
GC_malloc_uncollectable(0)).
* tests/test.c [!DBG_HDRS_ALL] (run_one_test): Add missing increments
of collectable_count for GC_malloc(8) and GC_malloc(17).
* tests/test.c (run_one_test): Add missing increment of
collectable_count for (void)GC_MALLOC(0).

diff --git a/tests/test.c b/tests/test.c
index c8b9cecd2c817108cc0d04c83059e821954ecb9b..4e616266d81205d7c29849dec1acfb6096010c1c 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1273,7 +1273,7 @@ void run_one_test(void)
                       (unsigned long)GC_size(GC_malloc(0)));
         FAIL;
       }
-      collectable_count += 1;
+      uncollectable_count++;
       if (GC_size(GC_malloc_uncollectable(0)) != MIN_WORDS * sizeof(GC_word)) {
         GC_printf("GC_malloc_uncollectable(0) failed\n");
         FAIL;
@@ -1321,6 +1321,7 @@ void run_one_test(void)
       }
       z = GC_malloc(8);
       CHECK_OUT_OF_MEMORY(z);
+      collectable_count++;
       GC_PTR_STORE(z, x);
       if (*z != x) {
         GC_printf("GC_PTR_STORE failed: %p != %p\n", (void *)(*z), (void *)x);
@@ -1346,6 +1347,7 @@ void run_one_test(void)
           size_t i;
 
           (void)GC_malloc(17);
+          collectable_count++;
           for (i = sizeof(GC_word); i < 512; i *= 2) {
             GC_word result = (GC_word) GC_memalign(i, 17);
             if (result % i != 0 || result == 0 || *(int *)result != 0) FAIL;
@@ -1379,6 +1381,7 @@ void run_one_test(void)
            size_t i;
            for (i = 0; i < 10000; ++i) {
              (void)GC_MALLOC(0);
+             collectable_count++;
              GC_FREE(GC_MALLOC(0));
              (void)GC_MALLOC_ATOMIC(0);
              GC_FREE(GC_MALLOC_ATOMIC(0));