Remove unnecessary headers from the test suite.

Copied from Perforce
 Change: 185340
 ServerID: perforce.ravenbrook.com

mps/code/abqtest.c

@@ -10,7 +10,8 @@
 #include "mpstd.h"
 #include "testlib.h"
 
-#include <stdlib.h>
+#include <stdlib.h> /* free, malloc */
+#include <stdio.h> /* printf */
 
 
 SRCID(abqtest, "$Id$");

mps/code/amcss.c

@@ -15,8 +15,7 @@
 #include "mps.h"
 #include "mpslib.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf, putchar */
 
 
 /* These values have been tuned in the hope of getting one dynamic collection. */

mps/code/amcsshe.c

@@ -14,8 +14,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf, putchar */
 
 
 /* These values have been tuned in the hope of getting one dynamic collection. */

mps/code/amcssth.c

@@ -15,10 +15,9 @@
 #include "mpslib.h"
 #include "mpscamc.h"
 #include "mpsavm.h"
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <time.h>
+
+#include <pthread.h> /* pthread_create, pthread_join */
+#include <stdio.h> /* fflush, printf, putchar */
 
 
 /* These values have been tuned in the hope of getting one dynamic collection. */

mps/code/amsss.c

@@ -17,10 +17,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf */
 
 
 #define exactRootsCOUNT 50

mps/code/amssshe.c

@@ -15,10 +15,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf */
 
 
 #define exactRootsCOUNT 50

mps/code/apss.c

@@ -16,7 +16,7 @@
 #include "testlib.h"
 #include "mpslib.h"
 
-#include <stdarg.h>
+#include <stdio.h> /* printf */
 #include <stdlib.h> /* malloc */
 
 

mps/code/arenacv.c

@@ -14,8 +14,6 @@
  * being allocated; this requires using two adjacent zones.
  */
 
-#include <stdlib.h>
-
 #include "mpm.h"
 #include "poolmv.h"
 #include "testlib.h"
@@ -23,6 +21,9 @@
 #include "mpsavm.h"
 #include "mpsacl.h"
 
+#include <stdio.h> /* printf */
+#include <stdlib.h> /* malloc */
+
 
 #define tractsSIZE 500
 

mps/code/awlut.c

@@ -17,7 +17,8 @@
 #include "mps.h"
 #include "mpstd.h"
 
-#include <string.h>
+#include <stdio.h> /* printf */
+#include <string.h> /* strlen */
 
 
 #define testArenaSIZE     ((size_t)64<<20)

mps/code/awluthe.c

@@ -18,7 +18,8 @@
 #include "mps.h"
 #include "mpstd.h"
 
-#include <string.h>
+#include <string.h> /* strlen */
+#include <stdio.h> /* printf */
 
 
 #define testArenaSIZE     ((size_t)64<<20)

mps/code/awlutth.c

@@ -17,8 +17,9 @@
 #include "mps.h"
 #include "mpstd.h"
 
-#include <string.h>
-#include <pthread.h>
+#include <pthread.h> /* pthread_create, pthread_join */
+#include <stdio.h> /* printf, puts */
+#include <string.h> /* strlen */
 
 
 #define testArenaSIZE     ((size_t)64<<20)

mps/code/btcv.c

@@ -18,7 +18,7 @@
 #include "testlib.h"
 #include "mpslib.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* printf */
 
 SRCID(btcv, "$Id$");
 

mps/code/bttest.c

@@ -10,11 +10,10 @@
 #include "mpsavm.h"
 #include "testlib.h"
 #include "mpslib.h"
-
-#include <stdlib.h>
-#include <stdarg.h>
 #include "mpstd.h"
-#include <time.h>
+
+#include <stdio.h> /* fflush, fgets, printf, putchar, puts */
+#include <stdlib.h> /* exit, strtol */
 
 SRCID(bttest, "$Id$");
 

mps/code/exposet0.c

@@ -21,8 +21,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf, puts, stdout */
 
 
 /* These values have been tuned in the hope of getting one dynamic collection. */

mps/code/expt825.c

@@ -35,7 +35,7 @@
 #include "fmtdytst.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* printf, fflush, stdout */
 
 
 #define testArenaSIZE   ((size_t)16<<20)

mps/code/fbmtest.c

@@ -24,9 +24,7 @@
 #include "mpstd.h"
 #include "testlib.h"
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
+#include <stdio.h> /* printf */
 
 SRCID(fbmtest, "$Id$");
 

mps/code/finalcv.c

@@ -27,7 +27,7 @@
 #include "fmtdytst.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* printf */
 
 
 #define testArenaSIZE   ((size_t)16<<20)

mps/code/finaltest.c

@@ -28,7 +28,7 @@
 #include "fmtdytst.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* fflush, printf, stdout */
 
 
 #define testArenaSIZE   ((size_t)16<<20)

mps/code/fotest.c

@@ -28,7 +28,7 @@
 #include "mpmtypes.h"
 #include "poolmfs.h"
 
-#include <stdarg.h>
+#include <stdio.h> /* printf */
 
 
 #define testArenaSIZE   ((((size_t)3)<<24) - 4)

mps/code/locbwcss.c

@@ -11,8 +11,7 @@
 #include "mpslib.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
+#include <stdio.h> /* printf */
 
 
 /* some constants */

mps/code/lockcov.c

@@ -7,7 +7,9 @@
 #include "mpm.h"
 #include "testlib.h"
 #include "mpslib.h"
-#include <stdlib.h>             /* for malloc & free */
+
+#include <stdio.h> /* printf */
+#include <stdlib.h> /* free, malloc */
 
 
 int main(int argc, char *argv[])

mps/code/locusss.c

@@ -12,8 +12,7 @@
 #include "mpslib.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
+#include <stdio.h> /* printf */
 
 
 /* some constants */

mps/code/locv.c

@@ -13,6 +13,8 @@
 #include "mpsclo.h"
 #include "mpsavm.h"
 
+#include <stdio.h> /* printf */
+
 
 #define testArenaSIZE   ((size_t)16<<20)
 

mps/code/messtest.c

@@ -10,8 +10,7 @@
 #include "testlib.h"
 #include "mpslib.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
+#include <stdio.h> /* printf */
 
 SRCID(messtest, "$Id$");
 

mps/code/mpmss.c

@@ -7,19 +7,14 @@
 
 #include "mpscmv.h"
 #include "mpscmvff.h"
+#include "mpscmfs.h"
 #include "mpslib.h"
 #include "mpsavm.h"
 #include "testlib.h"
 #include "mpslib.h"
 #include "mps.h"
-#include <stdlib.h>
-#include <stdarg.h>
 
-
-/* TODO: Decide whether we should support the MPS pool class externally,
-   create mpscmfs.h, and replace this extern with proper use of its
-   interface. */
-extern mps_class_t PoolClassMFS(void);
+#include <stdio.h> /* printf */
 
 
 #define testArenaSIZE   ((((size_t)64)<<20) - 4)
@@ -156,8 +151,7 @@ static void testInArena(mps_arena_t arena, mps_pool_debug_option_s *options)
 
   printf("MFS\n");
   fixedSizeSize = 13;
-  die(stress(PoolClassMFS(),
-             fixedSize, arena, (size_t)100000, fixedSizeSize),
+  die(stress(mps_class_mfs(), fixedSize, arena, (size_t)100000, fixedSizeSize),
       "stress MFS");
 
   printf("MV\n");

mps/code/mpsicv.c

@@ -16,10 +16,7 @@
 #include "mps.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
-#include <string.h>
+#include <stdio.h> /* printf */
 
 
 #define exactRootsCOUNT  49

mps/code/nailboardtest.c

@@ -12,6 +12,8 @@
 #include "bt.h"
 #include "nailboard.h"
 
+#include <stdio.h> /* printf */
+
 
 static void test(mps_arena_t arena)
 {

mps/code/poolncv.c

@@ -10,6 +10,8 @@
 #include "testlib.h"
 #include "mpslib.h"
 
+#include <stdio.h> /* printf */
+
 
 static void testit(ArenaClass class, ArgList args)
 {

mps/code/qs.c

@@ -30,7 +30,8 @@
 #include "mpscmv.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* printf */
+#include <stdlib.h> /* qsort */
 
 
 #define testArenaSIZE ((size_t)1000*1024)
@@ -316,14 +317,14 @@ static void validate(void)
   for(i = 0; i < listl; ++i) {
     cdie(((QSCell)reg[1])->tag == QSInt, "validate int");
     if((mps_word_t)((QSCell)reg[1])->value != list[i]) {
-        (void)fprintf(stdout, "mps_res_t: Element %"PRIuLONGEST" of the "
-                      "two lists do not match.\n", (ulongest_t)i);
+        printf("mps_res_t: Element %"PRIuLONGEST" of the "
+               "two lists do not match.\n", (ulongest_t)i);
       return;
     }
     reg[1] = (mps_addr_t)((QSCell)reg[1])->tail;
   }
   cdie(reg[1] == (mps_word_t)0, "validate end");
-  (void)fprintf(stdout, "Note: Lists compare equal.\n");
+  printf("Note: Lists compare equal.\n");
 }
 
 

mps/code/segsmss.c

@@ -23,10 +23,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf, puts, stdout */
 
 
 /* Forward declarations */
@@ -789,7 +786,7 @@ static void *test(void *arg, size_t s)
                             &ambigRoots[0], ambigRootsCOUNT),
       "root_create_table(ambig)");
 
-  (void)fputs(indent, stdout);
+  puts(indent);
 
   /* create an ap, and leave it busy */
   die(mps_reserve(&busy_init, busy_ap, 64), "mps_reserve busy");

mps/code/steptest.c

@@ -16,8 +16,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> /* fflush, printf, putchar, stdout */
 
 #define testArenaSIZE     ((size_t)((size_t)64 << 20))
 #define avLEN             3

mps/code/teletest.c

@@ -12,7 +12,8 @@
 #include "testlib.h"
 #include "mpslib.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* fflush, fgets, printf, stdin, stdout */
+#include <stdlib.h> /* exit, EXIT_SUCCESS, strtoul */
 
 SRCID(teletest, "$Id$");
 
@@ -34,8 +35,8 @@ static void callControl(mps_word_t reset, mps_word_t flip)
   old = mps_telemetry_control(reset, flip);
   new = mps_telemetry_control((mps_word_t)0, (mps_word_t)0);
 
-  (void)printf(WORD_FORMAT " -> " WORD_FORMAT "\n",
-               (ulongest_t)old, (ulongest_t)new);
+  printf(WORD_FORMAT " -> " WORD_FORMAT "\n",
+         (ulongest_t)old, (ulongest_t)new);
 }
 
 

mps/code/testlib.c

@@ -11,13 +11,11 @@
 #include "clock.h" /* for EVENT_CLOCK */
 #include "mps.h"
 #include "misc.h" /* for NOOP */
-#include <math.h>
-#include <stdlib.h>
-#include <limits.h>
-#ifdef MPS_OS_IA
-struct itimerspec; /* stop complaints from time.h */
-#endif
-#include <time.h>
+
+#include <math.h> /* fmod */
+#include <stdio.h> /* fflush, printf, stderr, sscanf, vfprintf */
+#include <stdlib.h> /* abort, exit, getenv */
+#include <time.h> /* time */
 
 
 /* fail -- like assert, but (notionally) returns a value, so usable in an expression */

mps/code/testlib.h

@@ -12,14 +12,7 @@
 
 #include "mps.h"
 #include "misc.h" /* for STR */
-
-/* Include system header hackery. */
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpswin.h"
-#endif
-
-#include <stdio.h>
 
 
 /* Suppress Visual C warnings at warning level 4, */

mps/code/walkt0.c

@@ -18,8 +18,7 @@
 #include "mpstd.h"
 #include "mps.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> /* printf */
 
 #define testArenaSIZE     ((size_t)((size_t)64 << 20))
 #define avLEN             3

mps/code/zcoll.c

@@ -63,8 +63,7 @@
 #include "fmtdytst.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
-#include <time.h>  /* clock */
+#include <stdio.h> /* fflush, printf, putchar, puts, stdout */
 
 
 /* testChain -- generation parameters for the test */

mps/code/zmess.c

@@ -108,7 +108,7 @@
 #include "fmtdytst.h"
 #include "mpstd.h"
 
-#include <stdlib.h>
+#include <stdio.h> /* printf */
 
 
 #define testArenaSIZE   ((size_t)16<<20)