upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 02:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3980-revert-unit-test-forking-9.18' into 'bind-9.18'

Browse source 
Revert "Kill unit tests that run more than 1200 seconds"

See merge request isc-projects/bind9!7834
This commit is contained in:
Ondřej Surý 2023-04-14 04:22:20 +00:00
commit 19bf6c846f
2 changed files with 14 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/isc/include/isc/util.h
View file

@ -59,12 +59,6 @@
*/
#define UNUSED(x) (void)(x)
#if __has_c_attribute(maybe_unused)
#define ISC_ATTR_UNUSED [[maybe_unused]]
#else
#define ISC_ATTR_UNUSED __attribute__((__unused__))
#endif
#if __GNUC__ >= 8 && !defined(__clang__)
#define ISC_NONSTRING __attribute__((nonstring))
#else /* if __GNUC__ >= 8 && !defined(__clang__) */

53
tests/include/tests/isc.h
View file

@ -17,7 +17,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <unistd.h>
#include <uv.h>
#include <isc/buffer.h>
@ -36,9 +35,6 @@
#include "task_p.h"
#include "timer_p.h"
#include <sys/types.h>
#include <sys/wait.h>
#define CHECK(r) \
do { \
result = (r); \
@ -106,39 +102,18 @@ teardown_managers(void **state);
#define ISC_TEST_MAIN ISC_TEST_MAIN_CUSTOM(NULL, NULL)
#define ISC_TEST_MAIN_CUSTOM(setup, teardown) \
static int __child = 0; \
static void __alarm(int sig ISC_ATTR_UNUSED) { \
kill(__child, SIGABRT); \
} \
int main(void) { \
int r, status; \
\
switch ((__child = fork())) { \
case 0: \
break; \
case -1: \
exit(1); \
default: \
signal(SIGALRM, __alarm); \
alarm(1200); \
if ((r = waitpid(__child, &status, 0)) == __child) { \
/* Pass the exit status to the caller. */ \
if (WIFEXITED(status)) { \
exit(WEXITSTATUS(status)); \
} \
} \
exit(1); \
} \
\
signal(SIGPIPE, SIG_IGN); \
\
isc_mem_debugging |= ISC_MEM_DEBUGRECORD; \
isc_mem_create(&mctx); \
\
r = cmocka_run_group_tests(tests, setup, teardown); \
\
isc_mem_destroy(&mctx); \
\
return (r); \
#define ISC_TEST_MAIN_CUSTOM(setup, teardown) \
int main(void) { \
int r; \
\
signal(SIGPIPE, SIG_IGN); \
\
isc_mem_debugging |= ISC_MEM_DEBUGRECORD; \
isc_mem_create(&mctx); \
\
r = cmocka_run_group_tests(tests, setup, teardown); \
\
isc_mem_destroy(&mctx); \
\
return (r); \
}