mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 11:03:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

rust: rust_is_available: support testing with bash as /bin/sh

Browse Source 
`command -v` behaves differently on `dash` vs. `bash` when faced with
a file without the execute bit.

Thus, for the non-executable `rustc` and `bindgen` tests, support both
possible outputs that the script currently gives.

This makes the test script clean on distributions like Fedora.

Reviewed-by: Onur Özkan <work@onurozkan.dev>
Link: https://patch.msgid.link/20260719130723.162899-1-ojeda@kernel.org
[ Added custom assertion message as suggested. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Miguel Ojeda
2026-07-19 15:07:23 +02:00
parent 16861ca350
commit fd045c81ed
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/rust_is_available_test.py
View File

@@ -177,7 +177,13 @@ else:
def test_rustc_nonexecutable(self):
result = self.run_script(self.Expected.FAILURE, { "RUSTC": self.nonexecutable })
self.assertIn(f"Running '{self.nonexecutable}' to check the Rust compiler version failed with", result.stderr)
self.assertTrue(
# `dash`.
f"Running '{self.nonexecutable}' to check the Rust compiler version failed with" in result.stderr or
# `bash`.
f"Rust compiler '{self.nonexecutable}' could not be found." in result.stderr,
f"Unexpected `stderr`:\n{result.stderr}"
)
def test_rustc_unexpected_binary(self):
result = self.run_script(self.Expected.FAILURE, { "RUSTC": self.unexpected_binary })
@@ -205,7 +211,13 @@ else:
def test_bindgen_nonexecutable(self):
result = self.run_script(self.Expected.FAILURE, { "BINDGEN": self.nonexecutable })
self.assertIn(f"Running '{self.nonexecutable}' to check the Rust bindings generator version failed with", result.stderr)
self.assertTrue(
# `dash`.
f"Running '{self.nonexecutable}' to check the Rust bindings generator version failed with" in result.stderr or
# `bash`.
f"Rust bindings generator '{self.nonexecutable}' could not be found." in result.stderr,
f"Unexpected `stderr`:\n{result.stderr}"
)
def test_bindgen_unexpected_binary(self):
result = self.run_script(self.Expected.FAILURE, { "BINDGEN": self.unexpected_binary })