Implement countdown for testgetdests (Issue #33)

Author: michaelrsweet

cups/Makefile

@@ -180,6 +180,8 @@ test:		$(UNITTARGETS)
 #	fi
 	echo Running file API tests...
 	./testfile 2>>test.log
+	echo Running cupsGetDests API tests...
+	./testgetdests 2>>test.log
 	echo Running HTTP API tests...
 	./testhttp 2>>test.log
 	echo Running IPP API tests...

cups/testgetdests.c

@@ -1,44 +1,64 @@
-/*
- * CUPS cupsGetDests API test program for CUPS.
- *
- * Copyright 2017 by Apple Inc.
- *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
- */
-
-/*
- * Include necessary headers...
- */
+//
+// CUPS cupsGetDests API test program for CUPS.
+//
+// Copyright © 2023 by OpenPrinting.
+// Copyright © 2017 by Apple Inc.
+//
+// Licensed under Apache License v2.0.  See the file "LICENSE" for more
+// information.
+//
 
 #include <stdio.h>
-#include "cups.h"
+#include <stdlib.h>
 #include <sys/time.h>
+#include "cups.h"
+#include "test-internal.h"
 
 
-/*
- * 'main()' - Loop calling cupsGetDests.
- */
+//
+// 'main()' - Loop calling cupsGetDests.
+//
 
-int                                     /* O - Exit status */
-main(void)
+int                                     // O - Exit status
+main(int  argc,				// I - Number of command-line arguments
+     char *argv[])			// I - Command-line arguments
 {
-  int           num_dests;              /* Number of destinations */
-  cups_dest_t   *dests;                 /* Destinations */
-  struct timeval start, end;            /* Start and stop time */
-  double        secs;                   /* Total seconds to run cupsGetDests */
+  size_t	count = 1;		// Number of times
+  size_t	num_dests;		// Number of destinations
+  cups_dest_t	*dests;			// Destinations
+  struct timeval start, end;		// Start and stop time
+  double	secs;			// Total seconds to run cupsGetDests
+
+
+  // Parse command-line...
+  if (argc > 2 || (argc == 2 && (argv[1][0] < '1' || argv[1][0] > '9')))
+  {
+    fputs("Usage: ./testgetdests [COUNT]\n", stderr);
+    return (1);
+  }
 
+  if (argc == 2)
+    count = strtoul(argv[1], NULL, 10);
+  else
+    count = 1;
 
-  for (;;)
+  // Run tests...
+  while (count > 0)
   {
+    testBegin("cupsGetDests");
     gettimeofday(&start, NULL);
     num_dests = cupsGetDests(CUPS_HTTP_DEFAULT, &dests);
     gettimeofday(&end, NULL);
     secs = end.tv_sec - start.tv_sec + 0.000001 * (end.tv_usec - start.tv_usec);
 
-    printf("Found %d printers in %.3f seconds...\n", num_dests, secs);
+    testEndMessage(secs < 2.0, "%u printers in %.3f seconds", (unsigned)num_dests, secs);
 
     cupsFreeDests(num_dests, dests);
-    sleep(1);
+
+    count --;
+
+    if (count > 0)
+      sleep(1);
   }
 
   return (0);