svn commit: r312103 - head/tests/sys/vfs

Cy Schubert Cy.Schubert at komquats.com
Sat Jan 14 02:40:03 UTC 2017


In message <201701140103.v0E13K8b068874 at 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 at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.




More information about the svn-src-all mailing list