From 556af832b2b0e6cba7107b744c88c03f1dcd275f Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 14 Apr 2020 09:31:40 +0000 Subject: [PATCH] cc: the autopkgtests apparently want an x86-64 cross-compiler, give them one. --- src/cc/debian/changelog | 8 ++++++++ src/cc/debian/tests/control | 6 +++--- src/cc/debian/tests/control.debcargo.hint | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/cc/debian/tests/control.debcargo.hint diff --git a/src/cc/debian/changelog b/src/cc/debian/changelog index b569f64d1..c786896b4 100644 --- a/src/cc/debian/changelog +++ b/src/cc/debian/changelog @@ -1,3 +1,11 @@ +rust-cc (1.0.50-4) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package cc 1.0.50 from crates.io using debcargo 2.4.2 + * The tests apparently want an x86-64 cross-compiler, add a test-dependency. + + -- Peter Michael Green Tue, 14 Apr 2020 09:28:15 +0000 + rust-cc (1.0.50-3) unstable; urgency=medium * Team upload. diff --git a/src/cc/debian/tests/control b/src/cc/debian/tests/control index 3c0773710..f44cc9f7b 100644 --- a/src/cc/debian/tests/control +++ b/src/cc/debian/tests/control @@ -1,14 +1,14 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --all-features Features: test-name=@ -Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, @ +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, g++-x86-64-linux-gnu, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --no-default-features Features: test-name=librust-cc-dev -Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, @ +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, g++-x86-64-linux-gnu, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --features jobserver Features: test-name=librust-cc+jobserver-dev -Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, @ +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, g++, g++-x86-64-linux-gnu, @ Restrictions: allow-stderr, skip-not-installable diff --git a/src/cc/debian/tests/control.debcargo.hint b/src/cc/debian/tests/control.debcargo.hint new file mode 100644 index 000000000..654bd0950 --- /dev/null +++ b/src/cc/debian/tests/control.debcargo.hint @@ -0,0 +1,14 @@ +Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --all-features +Features: test-name=@ +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --no-default-features +Features: test-name=librust-cc-dev +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test cc 1.0.50 --all-targets --features jobserver +Features: test-name=librust-cc+jobserver-dev +Depends: dh-cargo (>= 18), librust-tempfile-3+default-dev, @ +Restrictions: allow-stderr, skip-not-installable -- 2.39.5