Skip to content

Commit 6b94990

Browse files
Make rustdoc-gui test suite able to run with different sub directories
1 parent 1b0976c commit 6b94990

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/bootstrap/test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ impl Step for RustdocGUI {
832832
let _ = fs::remove_dir_all(&out_dir);
833833

834834
// We generate docs for the libraries present in the rustdoc-gui's src folder.
835-
let libs_dir = Path::new("src/test/rustdoc-gui/src");
835+
let libs_dir = builder.build.src.join("src/test/rustdoc-gui/src");
836836
for entry in libs_dir.read_dir().expect("read_dir call failed") {
837837
let entry = entry.expect("invalid entry");
838838
let path = entry.path();
@@ -846,11 +846,11 @@ impl Step for RustdocGUI {
846846
// We now run GUI tests.
847847
let mut command = Command::new(&nodejs);
848848
command
849-
.arg("src/tools/rustdoc-gui/tester.js")
849+
.arg(builder.build.src.join("src/tools/rustdoc-gui/tester.js"))
850850
.arg("--doc-folder")
851851
.arg(out_dir)
852852
.arg("--tests-folder")
853-
.arg("src/test/rustdoc-gui");
853+
.arg(builder.build.src.join("src/test/rustdoc-gui"));
854854
builder.run(&mut command);
855855
} else {
856856
builder.info("No nodejs found, skipping \"src/test/rustdoc-gui\" tests");

0 commit comments

Comments
 (0)