Module Name: src Committed By: kamil Date: Wed Apr 17 15:54:55 UTC 2019
Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Fix Clang/LLVM build in t_ptrace_wait.c Do not compile functions that might be unused. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/tests/lib/libc/sys/t_ptrace_wait.c diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.109 src/tests/lib/libc/sys/t_ptrace_wait.c:1.110 --- src/tests/lib/libc/sys/t_ptrace_wait.c:1.109 Mon Apr 15 16:47:47 2019 +++ src/tests/lib/libc/sys/t_ptrace_wait.c Wed Apr 17 15:54:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: t_ptrace_wait.c,v 1.109 2019/04/15 16:47:47 kamil Exp $ */ +/* $NetBSD: t_ptrace_wait.c,v 1.110 2019/04/17 15:54:55 kamil Exp $ */ /*- * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_ptrace_wait.c,v 1.109 2019/04/15 16:47:47 kamil Exp $"); +__RCSID("$NetBSD: t_ptrace_wait.c,v 1.110 2019/04/17 15:54:55 kamil Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -87,7 +87,9 @@ static int debug = 0; if (debug) printf(a, ##__VA_ARGS__); \ while (/*CONSTCOND*/0) +#ifndef TEST_VFORK_ENABLED #define TEST_VFORK_ENABLED 0 +#endif /// ---------------------------------------------------------------------------- @@ -3150,6 +3152,7 @@ FORK_TEST(fork7, fork, false, true, true FORK_TEST(fork8, fork, true, true, true) #endif +#if TEST_VFORK_ENABLED FORK_TEST(vfork1, vfork, false, false, false) #if defined(TWAIT_HAVE_PID) FORK_TEST(vfork2, vfork, true, false, false) @@ -3162,9 +3165,11 @@ FORK_TEST(vfork6, vfork, true, false, tr FORK_TEST(vfork7, vfork, false, true, true) FORK_TEST(vfork8, vfork, true, true, true) #endif +#endif /// ---------------------------------------------------------------------------- +#if TEST_VFORK_ENABLED static void traceme_vfork_fork_body(pid_t (*fn)(void)) { @@ -3223,6 +3228,7 @@ ATF_TC_BODY(name, tc) \ TRACEME_VFORK_FORK_TEST(traceme_vfork_fork, fork) TRACEME_VFORK_FORK_TEST(traceme_vfork_vfork, vfork) +#endif /// ---------------------------------------------------------------------------- @@ -5603,11 +5609,13 @@ ATF_TC_BODY(name, tc) \ FORK2_TEST(fork_singalmasked, true, false, false, true, false) FORK2_TEST(fork_singalignored, true, false, false, false, true) +#if TEST_VFORK_ENABLED FORK2_TEST(vfork_singalmasked, false, true, false, true, false) FORK2_TEST(vfork_singalignored, false, true, false, false, true) FORK2_TEST(vforkdone_singalmasked, false, false, true, true, false) FORK2_TEST(vforkdone_singalignored, false, false, true, false, true) #endif +#endif /// ---------------------------------------------------------------------------- @@ -6619,6 +6627,7 @@ CLONE_TEST(clone_files8, CLONE_FILES, tr //CLONE_TEST(clone_sighand8, CLONE_SIGHAND, true, true, true) #endif +#if TEST_VFORK_ENABLED CLONE_TEST(clone_vfork1, CLONE_VFORK, false, false, false) #if defined(TWAIT_HAVE_PID) CLONE_TEST(clone_vfork2, CLONE_VFORK, true, false, false) @@ -6631,6 +6640,7 @@ CLONE_TEST(clone_vfork6, CLONE_VFORK, tr CLONE_TEST(clone_vfork7, CLONE_VFORK, false, true, true) CLONE_TEST(clone_vfork8, CLONE_VFORK, true, true, true) #endif +#endif /// ---------------------------------------------------------------------------- @@ -6993,12 +7003,15 @@ CLONE_TEST2(clone_files_signalignored, C CLONE_TEST2(clone_files_signalmasked, CLONE_FILES, false, true) //CLONE_TEST2(clone_sighand_signalignored, CLONE_SIGHAND, true, false) // XXX //CLONE_TEST2(clone_sighand_signalmasked, CLONE_SIGHAND, false, true) // XXX +#if TEST_VFORK_ENABLED CLONE_TEST2(clone_vfork_signalignored, CLONE_VFORK, true, false) CLONE_TEST2(clone_vfork_signalmasked, CLONE_VFORK, false, true) #endif +#endif /// ---------------------------------------------------------------------------- +#if TEST_VFORK_ENABLE #if defined(TWAIT_HAVE_PID) static void traceme_vfork_clone_body(int flags) @@ -7079,6 +7092,7 @@ TRACEME_VFORK_CLONE_TEST(traceme_vfork_c //TRACEME_VFORK_CLONE_TEST(traceme_vfork_clone_sighand, CLONE_SIGHAND) // XXX TRACEME_VFORK_CLONE_TEST(traceme_vfork_clone_vfork, CLONE_VFORK) #endif +#endif /// ----------------------------------------------------------------------------