commit 2f86b7398a646dc95748cc314edb2ba0e3d25ef7
author Juan A. Suarez Romero <jasuarez@igalia.com> Tue Mar 28 18:00:39 2017 +0200
committer Andres Gomez <agomez@igalia.com> Wed Mar 29 19:14:25 2017 +0300
tree 724489a38b4f4a2d5b4fe96f9d1215507f2a19a5
parent dc01cb9c5f38d6cdbb583ba70db5e51cc8901236

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@amd.com>
(cherry picked from commit caa616ccc4384ea1479865e12b56cf816561a827)

src/compiler/glsl/tests/cache_test.c

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index 0ef05aa..efe4a9b 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -111,7 +111,7 @@
    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);
 }
 
 #define CACHE_TEST_TMP "./cache-test-tmp"