Patch test macro to work around qemu vfork bug when command not found

diff --git a/debian/patches/2003-workaround-qemu-vfork-command-not-found.patch b/debian/patches/2003-workaround-qemu-vfork-command-not-found.patch
new file mode 100644 (file)
index 0000000..553be81
--- /dev/null
+++ b/debian/patches/2003-workaround-qemu-vfork-command-not-found.patch
@@ -0,0 +1,17 @@
+--- a/crates/cargo-test-macro/src/lib.rs
++++ b/crates/cargo-test-macro/src/lib.rs
+@@ -203,6 +203,14 @@
+         }
+     };
+     if !output.status.success() {
++        // Debian specific patch, upstream wontfix:
++        // qemu has a faulty vfork where it fails to fail if a command is not
++        // found, with a unix_wait_status of 32512, or 0x7f00, 7f meaning
++        // exit code 127. See https://github.com/rust-lang/rust/issues/90825
++        use std::os::unix::process::ExitStatusExt;
++        if output.status.into_raw() == 0x7f00 {
++            return false;
++        }
+         panic!(
+             "expected command `{}` to be runnable, got error {}:\n\
+             stderr:{}\n\

diff --git a/debian/patches/series b/debian/patches/series
index cc97491335443647a4a93058b778ce1a62a3f811..a33919244518142fa7022bd45ca4df5e40275561 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 2002_disable-net-tests.patch
+2003-workaround-qemu-vfork-command-not-found.patch
 
 2200-workaround-x32-test.patch
 disable-fs-specific-test.patch