diff options
author | Damien Miller <djm@mindrot.org> | 2018-09-14 10:31:47 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-14 10:31:47 +1000 |
commit | 0aa1f230846ebce698e52051a107f3127024a05a (patch) | |
tree | 423f777b2ec55f0aac0cec9c774e616e5888c39a /regress/unittests/test_helper/fuzz.c | |
parent | d64e78526596f098096113fcf148216798c327ff (diff) |
allow SIGUSR1 as synonym for SIGINFO
Lets users on those unfortunate operating systems that lack SIGINFO
still be able to obtain progress information from unit tests :)
Diffstat (limited to 'regress/unittests/test_helper/fuzz.c')
-rw-r--r-- | regress/unittests/test_helper/fuzz.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/unittests/test_helper/fuzz.c b/regress/unittests/test_helper/fuzz.c index 99f1d036c..78b36654d 100644 --- a/regress/unittests/test_helper/fuzz.c +++ b/regress/unittests/test_helper/fuzz.c | |||
@@ -196,7 +196,6 @@ fuzz_dump(struct fuzz *fuzz) | |||
196 | dump(fuzz_ptr(fuzz), fuzz_len(fuzz)); | 196 | dump(fuzz_ptr(fuzz), fuzz_len(fuzz)); |
197 | } | 197 | } |
198 | 198 | ||
199 | #ifdef SIGINFO | ||
200 | static struct fuzz *last_fuzz; | 199 | static struct fuzz *last_fuzz; |
201 | 200 | ||
202 | static void | 201 | static void |
@@ -211,7 +210,6 @@ siginfo(int unused __attribute__((__unused__))) | |||
211 | atomicio(vwrite, STDERR_FILENO, buf, strlen(buf)); | 210 | atomicio(vwrite, STDERR_FILENO, buf, strlen(buf)); |
212 | } | 211 | } |
213 | } | 212 | } |
214 | #endif | ||
215 | 213 | ||
216 | struct fuzz * | 214 | struct fuzz * |
217 | fuzz_begin(u_int strategies, const void *p, size_t l) | 215 | fuzz_begin(u_int strategies, const void *p, size_t l) |
@@ -233,10 +231,11 @@ fuzz_begin(u_int strategies, const void *p, size_t l) | |||
233 | 231 | ||
234 | fuzz_next(ret); | 232 | fuzz_next(ret); |
235 | 233 | ||
236 | #ifdef SIGINFO | ||
237 | last_fuzz = ret; | 234 | last_fuzz = ret; |
235 | #ifdef SIGINFO | ||
238 | signal(SIGINFO, siginfo); | 236 | signal(SIGINFO, siginfo); |
239 | #endif | 237 | #endif |
238 | signal(SIGUSR1, siginfo); | ||
240 | 239 | ||
241 | return ret; | 240 | return ret; |
242 | } | 241 | } |
@@ -245,10 +244,11 @@ void | |||
245 | fuzz_cleanup(struct fuzz *fuzz) | 244 | fuzz_cleanup(struct fuzz *fuzz) |
246 | { | 245 | { |
247 | FUZZ_DBG(("cleanup, fuzz = %p", fuzz)); | 246 | FUZZ_DBG(("cleanup, fuzz = %p", fuzz)); |
248 | #ifdef SIGINFO | ||
249 | last_fuzz = NULL; | 247 | last_fuzz = NULL; |
248 | #ifdef SIGINFO | ||
250 | signal(SIGINFO, SIG_DFL); | 249 | signal(SIGINFO, SIG_DFL); |
251 | #endif | 250 | #endif |
251 | signal(SIGUSR1, SIG_DFL); | ||
252 | assert(fuzz != NULL); | 252 | assert(fuzz != NULL); |
253 | assert(fuzz->seed != NULL); | 253 | assert(fuzz->seed != NULL); |
254 | assert(fuzz->fuzzed != NULL); | 254 | assert(fuzz->fuzzed != NULL); |