servo: Merge #15665 - fixed an issue related with .DS_Store (from UnICorN21:ds_store); r=SimonSapin
authorHuxley <framlog@gmail.com>
Wed, 22 Feb 2017 06:12:52 -0800
changeset 373282 43230f4d5ea214340873cc3a9fff8d0f930a0296
parent 373281 c1d68f17f3c76513f1913dfdbefa28691eda7f2a
child 373283 6f92a2459194d682aa69958d988cccf8eb54849e
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersSimonSapin
milestone54.0a1
servo: Merge #15665 - fixed an issue related with .DS_Store (from UnICorN21:ds_store); r=SimonSapin <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15581. <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 7adc79047dc1fafef3615cb8fcc8e4a43764f262
servo/python/servo/testing_commands.py
--- a/servo/python/servo/testing_commands.py
+++ b/servo/python/servo/testing_commands.py
@@ -227,17 +227,17 @@ class MachCommands(CommandBase):
                     test_prefix = test_prefix[:-3]
                 test_prefix += "::"
                 test_patterns.append(test_prefix)
             # add test as-is otherwise
             else:
                 test_patterns.append(test)
 
         if not packages:
-            packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit")))
+            packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
 
         packages.discard('stylo')
 
         has_style = True
         try:
             packages.remove('style')
         except KeyError:
             has_style = False
@@ -340,17 +340,17 @@ class MachCommands(CommandBase):
                     test_prefix = test_prefix[:-3]
                 test_prefix += "::"
                 test_patterns.append(test_prefix)
             # add test as-is otherwise
             else:
                 test_patterns.append(test)
 
         if not packages:
-            packages = set(os.listdir(path.join(self.context.topdir, "tests", "compiletest")))
+            packages = set(os.listdir(path.join(self.context.topdir, "tests", "compiletest"))) - set(['.DS_Store'])
 
         packages.remove("helper")
 
         args = ["cargo", "test"]
         for crate in packages:
             args += ["-p", "%s_compiletest" % crate]
         args += test_patterns