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

Unified Diff: Tools/Scripts/test-webkitpy

Issue 654063002: Switch webkitpy to use the typ test framework (delete webkitpy.test). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix typo for bot_test_expectations Created 6 years, 2 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 | « no previous file | Tools/Scripts/webkitpy/common/system/executive_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/test-webkitpy
diff --git a/Tools/Scripts/test-webkitpy b/Tools/Scripts/test-webkitpy
index ee682cccf0aca3f20dc615fe8b6323ccc57cbea4..d7b5d996e806d12055ad47158074b4c21c0796d7 100755
--- a/Tools/Scripts/test-webkitpy
+++ b/Tools/Scripts/test-webkitpy
@@ -27,6 +27,39 @@
# 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 os
+import sys
+
+dirname = os.path.dirname
+scripts_dir = dirname(os.path.realpath(__file__))
+chromium_src_dir = dirname(dirname(dirname(dirname(scripts_dir))))
+
+path_to_typ = os.path.join(chromium_src_dir, 'third_party', 'typ')
+if path_to_typ not in sys.path:
+ sys.path.append(path_to_typ)
+
+import typ
+
+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 .
+ skip = [
+ 'webkitpy.common.checkout.*',
+ 'webkitpy.common.config.*',
+ 'webkitpy.tool.*',
+ 'webkitpy.w3c.*',
+ 'webkitpy.layout_tests.layout_package.bot_test_expectations_unittest.*',
+ ]
+else:
+ # The scm tests are really slow, so we skip them by default.
+ # bugs.webkit.org/show_bug.cgi?id=31818 .
+ skip = [
+ 'webkitpy.common.checkout.scm.scm_unittest.*',
+ ]
+
+sys.exit(typ.main(top_level_dir=scripts_dir,
+ skip=skip,
+ path=[os.path.join(scripts_dir, 'webkitpy', 'thirdparty')],
+ win_multiprocessing='spawn'))
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/common/system/executive_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698