Skip to content

Commit 8252907

Browse files
committed
Remove shell script; fix x.py test instead
1 parent a17b320 commit 8252907

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

src/bootstrap/test.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ impl Step for RustdocJSNotStd {
708708
target: self.target,
709709
mode: "js-doc-test",
710710
suite: "rustdoc-js",
711-
path: None,
711+
path: Some("src/test/rustdoc-js"),
712712
compare_mode: None,
713713
});
714714
} else {
@@ -1088,6 +1088,13 @@ impl Step for Compiletest {
10881088
cmd.arg("--llvm-filecheck")
10891089
.arg(builder.llvm_filecheck(builder.config.build));
10901090

1091+
if mode == "js-doc-test" {
1092+
// For js-doc-test, a test will remain ignored if the JS file
1093+
// is modified but the corresponding Rust source is not.
1094+
// By passing the --ignored flag we force them to still run.
1095+
cmd.arg("--ignored");
1096+
}
1097+
10911098
if builder.config.cmd.bless() {
10921099
cmd.arg("--bless");
10931100
}

src/tools/rustdoc-js/tester.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)