Fix issues with ignored paths (fixes tests.ignore btest)

zeek · Dec 16, 2022 · 013d53c · 013d53c
1 parent c562e3e
commit 013d53c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/btest b/btest
@@ -1529,7 +1529,7 @@ def findTests(paths, expand_globs=False):
         if os.path.isdir(path) and os.path.basename(path) in ignore_dirs:
             continue
 
-        ignores = [os.path.join(path, dir) for dir in ignore_dirs]
+        ignores = [normalize_path(os.path.join(path, dir)) for dir in ignore_dirs]
 
         m = RE_PART.match(rpath)
         if m:
@@ -1560,7 +1560,7 @@ def findTests(paths, expand_globs=False):
                         tests += readTestFile(os.path.join(dirpath, file))
 
                 # Don't recurse into these.
-                for (dir, dir_path) in [(dir, os.path.join(dirpath, dir)) for dir in dirnames]:
+                for (dir, dir_path) in [(dir, normalize_path(os.path.join(dirpath, dir))) for dir in dirnames]:
                     for skip in ignores:
                         if dir_path == skip:
                             dirnames.remove(dir)