Date: Fri, 13 Jan 2017 19:50:21 -0800 From: Conrad Meyer <cem@freebsd.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312103 - head/tests/sys/vfs Message-ID: <CAG6CVpXwyBmCQB8FLyPnkhGqQxGWTYrja5%2Binh6gWX9FZo1dAw@mail.gmail.com> In-Reply-To: <201701140239.v0E2doD2069898@slippy.cwsent.com> References: <cem@FreeBSD.org> <201701140103.v0E13K8b068874@repo.freebsd.org> <201701140239.v0E2doD2069898@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Cy, r312107 fixes it. If the warning-cleanups and major changes were committed separately, the more major changes could then have been reverted independently. Unfortunately, they were not. The warnings are harmless, though, so just turning them down again is fine. Best, Conrad On Fri, Jan 13, 2017 at 6:39 PM, Cy Schubert <Cy.Schubert@komquats.com> wrote: > In message <201701140103.v0E13K8b068874@repo.freebsd.org>, "Conrad E. > Meyer" wr > ites: >> Author: cem >> Date: Sat Jan 14 01:03:20 2017 >> New Revision: 312103 >> URL: https://svnweb.freebsd.org/changeset/base/312103 >> >> Log: >> Revert r310994 >> >> Don't implement some terrible hack on a test by test basis. The >> framework fix is straightforward and can be chased up in the original >> bug. >> >> Reviewed by: ngie ("be my guest") >> >> Modified: >> head/tests/sys/vfs/lookup_cap_dotdot.c >> >> Modified: head/tests/sys/vfs/lookup_cap_dotdot.c >> ============================================================================= >> = >> --- head/tests/sys/vfs/lookup_cap_dotdot.c Sat Jan 14 01:01:02 2017 >> (r312102) >> +++ head/tests/sys/vfs/lookup_cap_dotdot.c Sat Jan 14 01:03:20 2017 >> (r312103) >> @@ -31,27 +31,23 @@ __FBSDID("$FreeBSD$"); >> #include <sys/capsicum.h> >> #include <sys/sysctl.h> >> #include <sys/stat.h> >> -#include <sys/wait.h> >> >> #include <atf-c.h> >> -#include <assert.h> >> #include <errno.h> >> #include <stdlib.h> >> #include <string.h> >> >> #include "freebsd_test_suite/macros.h" >> >> -static char *abspath; >> -static int dirfd = -1; >> - >> -typedef void (*child_test_fn_t)(void); >> +static int dirfd = -1; >> +static char *abspath; >> >> static void >> -touchat(int _dirfd, const char *name) >> +touchat(int dirfd, const char *name) > > Buildworld is busted right here. It's probably best to leave the underbar > here and in the ATF_REQIRE below. > >> { >> int fd; >> >> - ATF_REQUIRE((fd = openat(_dirfd, name, O_CREAT | O_TRUNC | O_WRONLY, >> + ATF_REQUIRE((fd = openat(dirfd, name, O_CREAT | O_TRUNC | O_WRONLY, > > Here too. > >> 0777)) >= 0); >> ATF_REQUIRE(close(fd) == 0); >> } > > > -- > Cheers, > Cy Schubert <Cy.Schubert@cschubert.com> > FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org > > The need of the many outweighs the greed of the few. > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpXwyBmCQB8FLyPnkhGqQxGWTYrja5%2Binh6gWX9FZo1dAw>