Mesa (master): tests/cache_test: allow crossing mount points

Juan Antonio Suárez Romero jasuarez at kemper.freedesktop.org
Tue Mar 28 16:00:55 UTC 2017


Module: Mesa
Branch: master
Commit: caa616ccc4384ea1479865e12b56cf816561a827
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=caa616ccc4384ea1479865e12b56cf816561a827

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Tue Mar 28 18:00:39 2017 +0200

tests/cache_test: allow crossing mount points

When using an overlayfs system (like a Docker container), rmrf_local()
fails because part of the files to be removed are in different mount
points (layouts). And thus cache-test fails.

Letting crossing mount points is not a big problem, specially because
this is just for a test, not to be used in real code.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/compiler/glsl/tests/cache_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index 537a81bc76..bec1d240e9 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -124,7 +124,7 @@ rmrf_local(const char *path)
    if (path == NULL || *path == '\0' || *path != '.')
       return -1;
 
-   return nftw(path, remove_entry, 64, FTW_DEPTH | FTW_PHYS | FTW_MOUNT);
+   return nftw(path, remove_entry, 64, FTW_DEPTH | FTW_PHYS);
 }
 
 static void




More information about the mesa-commit mailing list