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

Submitted by Leonid Bobrov on Feb. 27, 2019, 7:13 p.m.

Details

Message ID 20190227191313.66300-1-mazocomp@disroot.org
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Wayland

Not browsing as part of any series.

Commit Message

Leonid Bobrov Feb. 27, 2019, 7:13 p.m.
*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@disroot.org>
---
 tests/test-helpers.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

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);
 

Comments

On Wed, 27 Feb 2019 21:13:08 +0200
Leonid Bobrov <mazocomp@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@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@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