[PATCH v8 1/6] tests: use /dev/fd to count open fds

[Pekka Paalanen]

On Wed, 27 Feb 2019 21:13:08 +0200
Leonid Bobrov <mazocomp at disroot.org> wrote:

> *BSD don't have /proc/self/fd, they use /dev/fd instead.
> At Linux /dev/fd is a symlink to /proc/self/fd
> 
> Signed-off-by: Leonid Bobrov <mazocomp at disroot.org>
> ---
>  tests/test-helpers.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/test-helpers.c b/tests/test-helpers.c
> index b2189d8..03419fb 100644
> --- a/tests/test-helpers.c
> +++ b/tests/test-helpers.c
> @@ -47,8 +47,8 @@ count_open_fds(void)
>  	struct dirent *ent;
>  	int count = 0;
>  
> -	dir = opendir("/proc/self/fd");
> -	assert(dir && "opening /proc/self/fd failed.");
> +	dir = opendir("/dev/fd");
> +	assert(dir && "opening /dev/fd failed.");
>  
>  	errno = 0;
>  	while ((ent = readdir(dir))) {
> @@ -57,7 +57,7 @@ count_open_fds(void)
>  			continue;
>  		count++;
>  	}
> -	assert(errno == 0 && "reading /proc/self/fd failed.");
> +	assert(errno == 0 && "reading /dev/fd failed.");
>  
>  	closedir(dir);
>  

Hi,

this patch works for me, and is a candidate for landing without BSD CI.

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.com>

(Leonid, this kind of reply means that I'm ok with the patch, and will
merge it a day or two later unless someone disagrees.)


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20190304/d6335489/attachment-0001.sig>