test: fix helper program

In commit 68aafe3d8d, we forgot to update the code in
the helper test program, which also uses these macros.

tests/check_hashmap.c

@@ -172,26 +172,24 @@ check_hashmap (
     int n = -1;
     int r = -1;
 
-    getopt_foreach(argc, argv, ":s:n:r:") {
+    OPT_START(argc, argv, "s:n:r:")
-      case 's':
+    OPT_OPT('s') {
         if (0 != prng_seed_from_hex(seed_buf, optarg)) {
             return -1;
         }
         seed = seed_buf;
         break;
-
+    }
-      case 'n':
+    OPT_OPT('n') {
         n = atoi(optarg);
         break;
-
+    }
-      case 'r':
+    OPT_OPT('r') {
         r = atoi(optarg);
         break;
-
-      default:
-        log_printf("bad option '-%c'", optopt);
-        return -1;
     }
+    OPT_END
+
     if (n < 10 || n > 30) {
         log_printf("bad size %d", n);
         return -1;

tests/check_lib.c

@@ -87,15 +87,12 @@ subcmd_hash (
 ) {
     unsigned long long seed = 0;
 
-    getopt_foreach(argc, argv, ":s:") {
+    OPT_START(argc, argv, "s:")
-      case 's':
+    OPT_OPT('s') {
         seed = strtoull(optarg, NULL, 16);
         break;
-
-      default:
-        log_printf("bad option '-%c'", optopt);
-        return -1;
     }
+    OPT_END
 
     hash_seed(seed);
     printf("%016" PRIx64 "\n", hash_digestcb(hash_check_cb, NULL));
@@ -110,22 +107,19 @@ subcmd_prng (
     uint64_t seed_buf[4], *seed = NULL;
     int n = 0;
 
-    getopt_foreach(argc, argv, ":s:n:") {
+    OPT_START(argc, argv, "s:n:")
-      case 's':
+    OPT_OPT('s') {
         if (0 != prng_seed_from_hex(seed_buf, optarg)) {
             return -1;
         }
         seed = seed_buf;
         break;
-
+    }
-      case 'n':
+    OPT_OPT('n') {
         n = atoi(optarg);
         break;
-
-      default:
-        log_printf("bad option '-%c'", optopt);
-        return -1;
     }
+    OPT_END
 
     if (0 != prng_seed(seed)) {
         return -1;

tests/check_sandbox.c

@@ -158,19 +158,17 @@ check_sandbox (
 #endif
     char const *path = NULL;
 
-    getopt_foreach(argc, argv, ":d:r") {
+    OPT_START(argc, argv, "d:r")
-      case 'd':
+    OPT_OPT('d') {
         path = optarg;
         break;
-
+    }
-      case 'r':
+    OPT_OPT('r') {
         flags |= SANDBOX_READONLY;
         break;
-
-      default:
-        log_printf("bad option '-%c'", optopt);
-        return -1;
     }
+    OPT_END
+
     if (path == NULL) {
         log_puts("path not specified");
         return -1;

tests/check_watcher.c

@@ -155,15 +155,13 @@ check_watcher (
 ) {
     char const *path = NULL;
 
-    getopt_foreach(argc, argv, ":d:") {
+    OPT_START(argc, argv, "d:")
-      case 'd':
+    OPT_OPT('d') {
         path = optarg;
         break;
-
-      default:
-        log_printf("bad option '-%c'", optopt);
-        return -1;
     }
+    OPT_END
+
     if (path == NULL) {
         log_puts("path not specified");
         return -1;