bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Allow rustdoc-js and rustdoc-js-std to use none default build dir location

Browse source
This commit is contained in:
Oliver Middleton 2020-03-13 23:24:12 +00:00
parent 965888adc2
commit 3f58ab6e24
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/test.rs
View file

@ -607,7 +607,6 @@ impl Step for RustdocTheme {
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub struct RustdocJSStd { pub struct RustdocJSStd {
pub host: Interned<String>,
pub target: Interned<String>, pub target: Interned<String>,
} }
@ -621,13 +620,16 @@ impl Step for RustdocJSStd {
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(RustdocJSStd { host: run.host, target: run.target }); run.builder.ensure(RustdocJSStd { target: run.target });
} }
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
if let Some(ref nodejs) = builder.config.nodejs { if let Some(ref nodejs) = builder.config.nodejs {
let mut command = Command::new(nodejs); let mut command = Command::new(nodejs);
command.args(&["src/tools/rustdoc-js-std/tester.js", &*self.host]); command
.arg(builder.src.join("src/tools/rustdoc-js-std/tester.js"))
.arg(builder.doc_out(self.target))
.arg(builder.src.join("src/test/rustdoc-js-std"));
builder.ensure(crate::doc::Std { target: self.target, stage: builder.top_stage }); builder.ensure(crate::doc::Std { target: self.target, stage: builder.top_stage });
builder.run(&mut command); builder.run(&mut command);
} else { } else {

2
src/tools/compiletest/src/runtest.rs
View file

@ -2779,7 +2779,7 @@ impl<'test> TestCx<'test> {
Command::new(&nodejs) Command::new(&nodejs)
.arg(root.join("src/tools/rustdoc-js/tester.js")) .arg(root.join("src/tools/rustdoc-js/tester.js"))
.arg(out_dir.parent().expect("no parent")) .arg(out_dir.parent().expect("no parent"))
.arg(&self.testpaths.file.file_stem().expect("couldn't get file stem")), .arg(self.testpaths.file.with_extension("js")),
); );
if !res.status.success() { if !res.status.success() {
self.fatal_proc_rec("rustdoc-js test failed!", &res); self.fatal_proc_rec("rustdoc-js test failed!", &res);

22
src/tools/rustdoc-js-std/tester.js
View file

@ -1,6 +1,5 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path');
const TEST_FOLDER = 'src/test/rustdoc-js-std/';
function getNextStep(content, pos, stop) { function getNextStep(content, pos, stop) {
while (pos < content.length && content[pos] !== stop && while (pos < content.length && content[pos] !== stop &&
@ -246,17 +245,16 @@ function readFileMatching(dir, name, extension) {
} }
function main(argv) { function main(argv) {
if (argv.length !== 3) { if (argv.length !== 4) {
console.error("Expected toolchain to check as argument (for example \ console.error("USAGE: node tester.js STD_DOCS TEST_FOLDER");
'x86_64-apple-darwin')");
return 1; return 1;
} }
var toolchain = argv[2]; var std_docs = argv[2];
var test_folder = argv[3];
var mainJs = readFileMatching("build/" + toolchain + "/doc/", "main", ".js"); var mainJs = readFileMatching(std_docs, "main", ".js");
var ALIASES = readFileMatching("build/" + toolchain + "/doc/", "aliases", ".js"); var ALIASES = readFileMatching(std_docs, "aliases", ".js");
var searchIndex = readFileMatching("build/" + toolchain + "/doc/", var searchIndex = readFileMatching(std_docs, "search-index", ".js").split("\n");
"search-index", ".js").split("\n");
if (searchIndex[searchIndex.length - 1].length === 0) { if (searchIndex[searchIndex.length - 1].length === 0) {
searchIndex.pop(); searchIndex.pop();
} }
@ -287,8 +285,8 @@ function main(argv) {
var errors = 0; var errors = 0;
fs.readdirSync(TEST_FOLDER).forEach(function(file) { fs.readdirSync(test_folder).forEach(function(file) {
var loadedFile = loadContent(readFile(TEST_FOLDER + file) + var loadedFile = loadContent(readFile(path.join(test_folder, file)) +
'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;'); 'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;');
const expected = loadedFile.EXPECTED; const expected = loadedFile.EXPECTED;
const query = loadedFile.QUERY; const query = loadedFile.QUERY;

10
src/tools/rustdoc-js/tester.js
View file

@ -1,8 +1,7 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process'); const { spawnSync } = require('child_process');
const TEST_FOLDER = 'src/test/rustdoc-js/';
function getNextStep(content, pos, stop) { function getNextStep(content, pos, stop) {
while (pos < content.length && content[pos] !== stop && while (pos < content.length && content[pos] !== stop &&
(content[pos] === ' ' || content[pos] === '\t' || content[pos] === '\n')) { (content[pos] === ' ' || content[pos] === '\t' || content[pos] === '\n')) {
@ -266,10 +265,11 @@ function main(argv) {
var errors = 0; var errors = 0;
for (var j = 3; j < argv.length; ++j) { for (var j = 3; j < argv.length; ++j) {
const test_name = argv[j]; const test_file = argv[j];
const test_name = path.basename(test_file, ".js");
process.stdout.write('Checking "' + test_name + '" ... '); process.stdout.write('Checking "' + test_name + '" ... ');
if (!fs.existsSync(TEST_FOLDER + test_name + ".js")) { if (!fs.existsSync(test_file)) {
errors += 1; errors += 1;
console.error("FAILED"); console.error("FAILED");
console.error("==> Missing '" + test_name + ".js' file..."); console.error("==> Missing '" + test_name + ".js' file...");
@ -279,7 +279,7 @@ function main(argv) {
const test_out_folder = out_folder + test_name; const test_out_folder = out_folder + test_name;
var [loaded, index] = load_files(test_out_folder, test_name); var [loaded, index] = load_files(test_out_folder, test_name);
var loadedFile = loadContent(readFile(TEST_FOLDER + test_name + ".js") + var loadedFile = loadContent(readFile(test_file) +
'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;'); 'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;');
const expected = loadedFile.EXPECTED; const expected = loadedFile.EXPECTED;
const query = loadedFile.QUERY; const query = loadedFile.QUERY;