Skip to content

Commit

Permalink
servo: Merge #2089 - Basic framework for running web platform tests (…
Browse files Browse the repository at this point in the history
…from Manishearth:wpt); r=Ms2ger

See #1479

This sets up a basic environment for running wpt. It instantiates a virtualenv, generates the manifest if it doesn't exist*, and runs the tests.

Currently @Ms2ger's [`run-in-servo` fork of wpt](https://github.com/Ms2ger/web-platform-tests/tree/run-in-servo/)  is used.

Note: I did everything in a shell script instead of make since one cannot run `source` from a makefile (the environment is immutable, apparently)


*It does not, however, update the manifest. We'll have to add an extra script for that.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9edfb439a65382d1f7f5659c40da70260a1cb7bc
  • Loading branch information
Manishearth committed Apr 18, 2014
1 parent 34326f4 commit 4b7ac4a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions servo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ src/components/script/dom/bindings/codegen/RegisterBindings.cpp
src/components/script/dom/bindings/codegen/PrototypeList.h
src/components/script/dom/bindings/codegen/UnionTypes.h
src/components/script/dom/bindings/codegen/UnionConversions.h
src/test/wpt/metadata/
4 changes: 4 additions & 0 deletions servo/mk/check.mk
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ check-content: contenttest
@$(call E, check: contenttests)
$(Q)./contenttest --source-dir=$(S)src/test/content $(TESTNAME)

.PHONY: check-wpt
check-wpt:
bash $(S)src/test/wpt/run.sh $(S)

.PHONY: tidy
tidy:
@$(call E, check: tidy)
Expand Down
4 changes: 4 additions & 0 deletions servo/mk/clean.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ clean-style:
@$(call E, "cleaning style")
$(Q)cd $(B)/src/components/style/ && rm -rf libstyle*.dylib libstyle*.rlib libstyle*.dSYM libstyle*.so $(DONE_style)

clean-wpt:
$(Q)rm -r _virtualenv
$(Q)rm $(S)/src/test/wpt/metadata/MANIFEST.json

clean-servo: clean-gfx clean-util clean-net clean-script clean-msg clean-style
@$(call E, "cleaning servo")
$(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so libservo*.a
Expand Down
1 change: 1 addition & 0 deletions servo/src/etc/tidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def do_license_check(name, contents):
"src/compiler", # Upstream
"src/components/main/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
"src/components/script/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
"src/test/wpt/web-platform-tests", # Upstream
]

def should_check(name):
Expand Down

0 comments on commit 4b7ac4a

Please sign in to comment.