Index: Tools/Scripts/test-webkitpy |
diff --git a/Tools/Scripts/test-webkitpy b/Tools/Scripts/test-webkitpy |
index ee682cccf0aca3f20dc615fe8b6323ccc57cbea4..d37ad41907b220a10d677abde28e729a8c6c5d4e 100755 |
--- a/Tools/Scripts/test-webkitpy |
+++ b/Tools/Scripts/test-webkitpy |
@@ -27,6 +27,38 @@ |
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-from webkitpy.common import multiprocessing_bootstrap |
-multiprocessing_bootstrap.run('webkitpy', 'test', 'main.py') |
+import sys |
+ |
+from webkitpy.common.host import Host |
+from webkitpy.common.webkit_finder import WebKitFinder |
+ |
+host = Host() |
+finder = WebKitFinder(host.filesystem) |
+path_to_typ = finder.path_from_chromium_base('third_party', 'typ', 'typ', 'cmdline.py') |
+ |
+ |
+# TODO: typ should support some way to run all of the tests that are |
ojan
2014/10/14 23:41:19
FIXME ?
|
+# normally skipped. |
+ |
+argv = sys.argv[1:] |
+if not '--skip' in argv: |
+ if sys.platform == 'win32': |
+ # These test fail on win32. We could annotate some of these in class-level |
+ # skips, but we don't support package/module-level skips. |
+ # bugs.webkit.org/show_bug.cgi?id=54526 . |
+ argv.extend(['--skip', 'webkitpy.common.checkout.*', |
+ '--skip', 'webkitpy.common.config.*', |
+ '--skip', 'webkitpy.tool.*', |
+ '--skip', 'webkitpy.w3c.*', |
+ '--skip', 'webkitpy.layout_tests.layout_package.bot_test_expectations.*']) |
+ else: |
+ # The scm tests are really slow, so we skip them by default. |
+ # bugs.webkit.org/show_bug.cgi?id=31818 . |
+ argv.extend(['--skip', 'webkitpy.common.checkout.scm.scm_unittest*']) |
+ |
+ |
+try: |
+ sys.exit(host.executive.call([sys.executable, path_to_typ] + argv)) |
+except KeyboardInterrupt: |
+ sys.exit(130) |