Merge ~blkerby/ubuntu/+source/rustc:fix-create-and-build-crate into ~canonical-foundations/ubuntu/+source/rustc:merge-1.91

[Brent Kerby]

Currently the "create-and-build-crate" test uses the system version of cargo and rustc (1.88), meaning it's not actually testing the version built by the package. So this merge proposal updates it to use the correct version. A few other changes:
- In the test Depends, replace @builddeps@ with @. The build dependencies are not needed for this test and are what resulted in the wrong cargo/rustc versions being available.
- In the test Restrictions, drop "rw-build-tree", as it isn't needed for this test.
- Include the "-x" bash option, to be able to see the commands being executed. This helped with debugging the test and also makes clear which versions are being used. This writes to stderr but we are already using the "allow-stderr" restriction so it works.

[Max Gilmour (maxgmr)]

Great catch, thanks! Merging.

review: Approve

diff --git a/debian/tests/control b/debian/tests/control
index 4cbda53..af2d84e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,8 +3,8 @@ Depends: @, @builddeps@
 Restrictions: rw-build-tree, allow-stderr
 
 Tests: create-and-build-crate
-Restrictions: rw-build-tree, allow-stderr
-Depends: @builddeps@
+Restrictions: allow-stderr
+Depends: @
 
 Tests: versioned-cargo-wrapper
 Depends: @, cargo
diff --git a/debian/tests/create-and-build-crate b/debian/tests/create-and-build-crate
index 46cc2a0..af5e2a0 100755
--- a/debian/tests/create-and-build-crate
+++ b/debian/tests/create-and-build-crate
@@ -1,10 +1,16 @@
 #!/bin/bash
-set -euo pipefail
+set -euox pipefail
+
+RUST_VERSION=$(dpkg-parsechangelog -SVersion | sed -re 's/([^.]+)\.([^.]+)\..*/\1.\2/')
+
+# Set RUSTC so that `cargo` knows which rustc to use
+export RUSTC=/usr/lib/rust-${RUST_VERSION}/bin/rustc
+CARGO=/usr/lib/rust-${RUST_VERSION}/bin/cargo
 
 tmpdir=$(mktemp -d)
 cd "$tmpdir"
 
-cargo new hello
+${CARGO} new hello
 cd hello
 
 cat <<EOF > src/main.rs
@@ -21,8 +27,8 @@ fn test() {
 }
 EOF
 
-cargo add 'anyhow@^1'
-cargo vendor
+${CARGO} add 'anyhow@^1'
+${CARGO} vendor
 
 mkdir -p .cargo
 cat <<EOF > .cargo/config.toml
@@ -33,7 +39,7 @@ replace-with = "vendored-sources"
 directory = "vendor"
 EOF
 
-cargo check
-cargo build
-cargo test
-cargo run
+${CARGO} check
+${CARGO} build
+${CARGO} test
+${CARGO} run