Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #828 : jdm/servo/contentfix, r=metajack

Browse source
This commit is contained in:
bors-servo 2013-08-30 13:15:39 -07:00
commit 3e801e777f
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/check.mk
View file

@ -42,11 +42,11 @@ check-test:
@$(call E, " $(DEPS_CHECK_TARGETS_ALL)")
.PHONY: check
check: $(DEPS_CHECK_TARGETS_FAST) check-servo tidy
check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy
@$(call E, check: all)
.PHONY: check-all
check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo tidy
check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content tidy
@$(call E, check: all)
.PHONY: check-servo

7
src/test/harness/contenttest/contenttest.rs
View file

@ -54,8 +54,9 @@ fn test_options(config: Config) -> TestOpts {
run_ignored: false,
run_tests: true,
run_benchmarks: false,
save_results: None,
compare_results: None,
ratchet_metrics: None,
ratchet_noise_percent: None,
save_metrics: None,
logfile: None
}
}
@ -84,7 +85,7 @@ fn run_test(file: ~str) {
let out = str::from_bytes(res.output);
io::print(out);
let lines: ~[&str] = out.split_iter('\n').collect();
for lines.iter().advance |&line| {
for &line in lines.iter() {
if line.contains("TEST-UNEXPECTED-FAIL") {
fail!(line);
}

12
src/test/html/content/test_prototypes.js
View file

@ -1,7 +1,7 @@
is(HTMLImageElement instanceof HTMLElement, true);
is(HTMLElement instanceof Element, true);
is(Element instanceof Node, true);
is(document instanceof Document, true);
is(document.documentElement instanceof HTMLElement, true);
is(document.documentElement instanceof Element, true);
is(window.document.documentElement instanceof Node, true);
is(window.document.documentElement instanceof Element, true);
is(window.document.documentElement instanceof HTMLElement, true);
is(window.document.documentElement instanceof HTMLHtmlElement, true);
is(window.document instanceof Document, true);
is(window.document instanceof HTMLDocument, true);
finish();

9
src/test/html/content/test_proxy_setter.html Normal file
View file

@ -0,0 +1,9 @@
<html>
<head>
<title></title>
<script src="harness.js"></script>
</head>
<body>
<script src="test_proxy_setter.js"></script>
</body>
</html>

4
src/test/html/content/test_proxy_setter.js Normal file
View file

@ -0,0 +1,4 @@
is(window.document.title, '');
window.document.title = 'foo';
is(window.document.title, 'foo');
finish();