test: fix helper program

In commit 68aafe3d8d, we forgot to update the code in
the helper test program, which also uses these macros.
This commit is contained in:
CismonX 2025-03-16 11:53:54 +08:00
parent 552a5797dc
commit 18bfbc73da
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
4 changed files with 26 additions and 38 deletions

View file

@ -172,26 +172,24 @@ check_hashmap (
int n = -1;
int r = -1;
getopt_foreach(argc, argv, ":s:n:r:") {
case 's':
OPT_START(argc, argv, "s:n:r:")
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;

View file

@ -87,15 +87,12 @@ subcmd_hash (
) {
unsigned long long seed = 0;
getopt_foreach(argc, argv, ":s:") {
case 's':
OPT_START(argc, argv, "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:") {
case 's':
OPT_START(argc, argv, "s:n:")
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;

View file

@ -158,19 +158,17 @@ check_sandbox (
#endif
char const *path = NULL;
getopt_foreach(argc, argv, ":d:r") {
case 'd':
OPT_START(argc, argv, "d:r")
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;

View file

@ -155,15 +155,13 @@ check_watcher (
) {
char const *path = NULL;
getopt_foreach(argc, argv, ":d:") {
case 'd':
OPT_START(argc, argv, "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;