Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2683)

Unified Diff: Tools/Scripts/webkitpy/test/main.py

Issue 18418010: Check in the thirdparty libs needed for webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Tools/Scripts/webkitpy/test/finder_unittest.py ('k') | Tools/Scripts/webkitpy/test/main_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/test/main.py
diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
index c3ad0d2a4d904f0df657ed392d55478fd4ac2231..cc1c387c2732d9317c2438c42ddd60da274eb4a4 100644
--- a/Tools/Scripts/webkitpy/test/main.py
+++ b/Tools/Scripts/webkitpy/test/main.py
@@ -37,6 +37,7 @@ from webkitpy.common.system.filesystem import FileSystem
from webkitpy.test.finder import Finder
from webkitpy.test.printer import Printer
from webkitpy.test.runner import Runner, unit_test_name
+from webkitpy.thirdparty import coverage
_log = logging.getLogger(__name__)
@@ -122,24 +123,11 @@ class Tester(object):
# Make sure PYTHONPATH is set up properly.
sys.path = self.finder.additional_paths(sys.path) + sys.path
- # We autoinstall everything up so that we can run tests concurrently
- # and not have to worry about autoinstalling packages concurrently.
- self.printer.write_update("Checking autoinstalled packages ...")
- from webkitpy.thirdparty import autoinstall_everything
- installed_something = autoinstall_everything()
-
- # FIXME: There appears to be a bug in Python 2.6.1 that is causing multiprocessing
- # to hang after we install the packages in a clean checkout.
- if installed_something:
- _log.warning("We installed new packages, so running things serially at first")
- self._options.child_processes = 1
-
if self._options.coverage:
_log.warning("Checking code coverage, so running things serially")
self._options.child_processes = 1
- import webkitpy.thirdparty.autoinstalled.coverage as coverage
- cov = coverage.coverage(omit=["/usr/*", "*/webkitpy/thirdparty/autoinstalled/*", "*/webkitpy/thirdparty/BeautifulSoup.py"])
+ cov = coverage.coverage(omit=["/usr/*", "*/webkitpy/thirdparty/*", "/System/*"])
cov.start()
self.printer.write_update("Checking imports ...")
« no previous file with comments | « Tools/Scripts/webkitpy/test/finder_unittest.py ('k') | Tools/Scripts/webkitpy/test/main_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698