nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiletest: detect nodejs binary, allow override

Browse Source 
Allow passing a custom nodejs directory in configure.
This commit is contained in:
Mark-Simulacrum 2016-11-10 16:04:53 -07:00
parent 3dced6f71e
commit c524c50edf
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/config.rs
View File

@ -128,6 +128,7 @@ struct Build {
submodules: Option<bool>,
gdb: Option<String>,
vendor: Option<bool>,
nodejs: Option<String>,
}
/// TOML representation of how the LLVM build is configured.
@ -232,6 +233,7 @@ impl Config {
}
config.rustc = build.rustc.map(PathBuf::from);
config.cargo = build.cargo.map(PathBuf::from);
config.nodejs = build.nodejs.map(PathBuf::from);
config.gdb = build.gdb.map(PathBuf::from);
set(&mut config.compiler_docs, build.compiler_docs);
set(&mut config.docs, build.docs);

13
src/bootstrap/sanity.rs
View File

@ -81,15 +81,16 @@ pub fn check(build: &mut Build) {
need_cmd("python".as_ref());
// Look for the nodejs command, needed for emscripten testing
if let Some(node) = have_cmd("node".as_ref()) {
build.config.nodejs = Some(node);
} else if let Some(node) = have_cmd("nodejs".as_ref()) {
build.config.nodejs = Some(node);
}
if let Some(ref s) = build.config.nodejs {
need_cmd(s.as_ref());
} else {
// Look for the nodejs command, needed for emscripten testing
if let Some(node) = have_cmd("node".as_ref()) {
build.config.nodejs = Some(node);
} else if let Some(node) = have_cmd("nodejs".as_ref()) {
build.config.nodejs = Some(node);
}
}
if let Some(ref gdb) = build.config.gdb {

7
src/tools/compiletest/src/runtest.rs
View File

@ -1456,8 +1456,11 @@ actual:\n\
// If this is emscripten, then run tests under nodejs
if self.config.target.contains("emscripten") {
let nodejs = self.config.nodejs.clone().unwrap_or("nodejs".to_string());
args.push(nodejs);
if let Some(ref p) = self.config.nodejs {
args.push(p.clone());
} else {
self.fatal("no NodeJS binary found (--nodejs)");
}
}
let exe_file = self.make_exe_name();