Fix findleaves emulator with symlink loopslineage-15.1

This updates the findleaves emulator to match the change

  "findleaves.py: prevent recursion into symlink loops"

Also update findleaves.py to match build/make/tools/findleaves.py

Change-Id: I20cf63c7b4e1a8a7b7fa8b4bde04ae821d5d98ea

1 files changed, 13 insertions, 0 deletions

diff --git a/testcase/tools/findleaves.py b/testcase/tools/findleaves.py
index 72cc024..f152a87 100755
--- a/testcase/tools/findleaves.py
+++ b/testcase/tools/findleaves.py
@@ -26,6 +26,7 @@ import sys
 def perform_find(mindepth, prune, dirlist, filenames):
   result = []
   pruneleaves = set(map(lambda x: os.path.split(x)[1], prune))
+  seen = set()
   for rootdir in dirlist:
     rootdepth = rootdir.count("/")
     for root, dirs, files in os.walk(rootdir, followlinks=True):
@@ -52,6 +53,18 @@ def perform_find(mindepth, prune, dirlist, filenames):
         if filename in files:
           result.append(os.path.join(root, filename))
           del dirs[:]
+
+      # filter out inodes that have already been seen due to symlink loops
+      i = 0
+      while i < len(dirs):
+        st = os.stat(os.path.join(root, dirs[i]))
+        key = (st.st_dev, st.st_ino)
+        if key in seen:
+          del dirs[i]
+        else:
+          i += 1
+          seen.add(key)
+
   return result
 
 def usage():