compile-test: allow overriding nodejs binary location

[Mark-Simulacrum]

Add a command-line argument to manually specify which nodejs binary should be used,
which disables the default search.

Original work done by @tari.

Fixes#34188.

[rust-highfive]

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

[TimNN]

There already seems to be a nodejs option: https://github.com/rust-lang/rust/blob/master/src/tools/compiletest/src/common.rs#L192, which is used when provided.

[bors]

☔ The latest upstream changes (presumably #37597) made this pull request unmergeable. Please resolve the merge conflicts.

[Mark-Simulacrum]

@TimNN That's true, I didn't notice. Though I believe that the existing nodejs doesn't try to detect other variants (node, node.exe, nodejs.exe). If this isn't considered worth it, feel free to close this, but then we should close the linked issue (#34188).

[TimNN]

Mh, there is some detection in bootstrap, so at least when using rustbuild, thinks should be detected correctly.

[alexcrichton]

Thanks for the PR! I agree with @TimNN that the best place for this is probably in rustbuild itself, we already need the node executable to run other unit test suites like the standard library. Perhaps this logic could be moved there and continue to be communicated to compiletest via this flag?

[alexcrichton]

@Mark-Simulacrum thoughts about updating to place this logic in rustbuild's detection and passing it down to compiletest that way?

[TimNN]

@alexcrichton: I'm pretty sure that logic is already present in rustbuild, isn't it?

See https://github.com/rust-lang/rust/blob/master/src/bootstrap/sanity.rs#L84-L89:

// Look for the nodejs command, needed for emscripten testingifletSome(node) = have_cmd("node".as_ref()){
build.config.nodejs = Some(node);}elseifletSome(node) = have_cmd("nodejs".as_ref()){
build.config.nodejs = Some(node);}

[Mark-Simulacrum]

I think I updated this as @alexcrichton suggested (with rustbuild), but I don't have a good way to test, since I don't use rustbuild locally. If someone can give me a set of commands to run then I can run those.

[TimNN]

No need for those extra checks, have_cmd will automatically consider .exe as well for each command.

[alexcrichton]

(agreed yeah)

[TimNN]

I don't think the current implementation needs much adjusting -- the only problem I can see with it is that it does not allow specifying the path to node in config.toml or via ./configure but will instead always search the path.

[Mark-Simulacrum]

Hmm, yeah, I see that now. Can someone point me to where I can make those changes (if we want to)? Otherwise we can just close this.

[alexcrichton]

I think it's fine to leave this kind of error reporting to compiletest rather than in rustbuild itself

[alexcrichton]

This should be set at some point, right? (from the command-line flag)

[TimNN]

There already is a nodejs option for compiletest (a few lines down).

[alexcrichton]

@Mark-Simulacrum you can take a look at src/bootstrap/config.rs to support manual configuration of node (which seems great to have!). You can mirror the logic for a custom rustc/cargo by just adding appropriate fields to the structs there, parsing them out, and also parsing the line from ./configure (if it exists) to go into the right field.

[TimNN]

Also you'll probably want to update the logic here to only try to auto detect node if it has not been specified by the user (somewhat like it's done for gdb just below).

[Mark-Simulacrum]

Alright, rebased and [hopefully] made this work with the comments suggested above.

[alexcrichton]

@bors: r+

Thanks!

[bors]

📌 Commit f752c98 has been approved by alexcrichton

[Mark-Simulacrum]

@bors did not seem to notice this was r+ed.

Edit: Bors noticed, but I pushed afterwards for some reason. I'm not sure why.

[eddyb]

@bors r=alexcrichton

[bors]

📌 Commit c524c50 has been approved by alexcrichton

[bors]

⌛ Testing commit c524c50 with merge fd983d0...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: alexcrichton
Pushing fd983d0 to master...