From 7b851bb4359ae1e267f956558d3767db1022acb2 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 23 Mar 2016 18:51:09 +0800 Subject: [PATCH] Bug 1258916 part 4 - Simplify code for skipping dir when populating test files. r=dbaron MozReview-Commit-ID: CXDyfTAn5qv --HG-- extra : rebase_source : 36b6484806b42a44a80ed7a395856507cb924876 --- layout/reftests/w3c-css/import-tests.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/layout/reftests/w3c-css/import-tests.py b/layout/reftests/w3c-css/import-tests.py index 5b27527e7b10..0a410893c59f 100755 --- a/layout/reftests/w3c-css/import-tests.py +++ b/layout/reftests/w3c-css/import-tests.py @@ -106,16 +106,12 @@ def remove_existing_dirs(): def populate_test_files(): global gSubtrees, gTestfiles + excludeDirs = ["support", "reftest", "reference", "reports", "tools"] for subtree in gSubtrees: for dirpath, dirnames, filenames in os.walk(subtree, topdown=True): - if "support" in dirnames: - dirnames.remove("support") - if "reftest" in dirnames: - dirnames.remove("reftest") - if "reference" in dirnames: - dirnames.remove("reference") - if "reports" in dirnames: - dirnames.remove("reports") + for exclDir in excludeDirs: + if exclDir in dirnames: + dirnames.remove(exclDir) for f in filenames: if f == "README" or \ f.find("-ref.") != -1: