Merge pull request mozilla#75 from kyoshino/bug-1181014-win64

Bug 1229852 - Make Firefox 40 win64 builds on the Release channel available on mozilla.org
m8ttyB · Dec 4, 2015 · 457790e · 457790e
2 parents f23fbe4 + ee9767c
commit 457790e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.pyc
+venv
diff --git a/conftest.py b/conftest.py
@@ -95,7 +95,7 @@
     'zu'
 )
 
-OS = ('win', 'linux', 'osx')
+OS = ('win', 'win64', 'linux', 'linux64', 'osx')
 
 
 def pytest_generate_tests(metafunc):

diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,5 @@
 [flake8]
 ignore=E501
+
+[pytest]
+norecursedirs = venv