From 5a1a427037e20ddb9ad4db30a43c2727966d6bf6 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 29 Oct 2022 08:45:43 +0000 Subject: [PATCH] rustix - fix autopkgtests --- src/rustix/debian/changelog | 6 ++++- src/rustix/debian/debcargo.toml | 5 ++++ .../debian/patches/disable-benches.diff | 23 +++++++++++++++++++ src/rustix/debian/patches/relax-dep.diff | 13 +++++++++++ src/rustix/debian/patches/series | 2 ++ 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/rustix/debian/patches/disable-benches.diff create mode 100644 src/rustix/debian/patches/relax-dep.diff diff --git a/src/rustix/debian/changelog b/src/rustix/debian/changelog index f8d881e8c..cb23480a6 100644 --- a/src/rustix/debian/changelog +++ b/src/rustix/debian/changelog @@ -6,8 +6,12 @@ rust-rustix (0.35.12-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium assembler and the Debian package does not ship pre-assembled outline assembler * Add built-using metadata for outline assembler. + * Fix autopkgtests + + Disable benches, they fail to build + + Relax dev-dependency on serial_test. + + Establish baseline for tests. - -- Peter Michael Green Sat, 29 Oct 2022 07:23:47 +0000 + -- Peter Michael Green Sat, 29 Oct 2022 08:56:05 +0000 rust-rustix (0.35.6-3) unstable; urgency=medium diff --git a/src/rustix/debian/debcargo.toml b/src/rustix/debian/debcargo.toml index 8d1f5d2f5..06c5bbb51 100644 --- a/src/rustix/debian/debcargo.toml +++ b/src/rustix/debian/debcargo.toml @@ -3,3 +3,8 @@ uploaders = ["John Goerzen "] excludes = ["**/*.a"] collapse_features = true +[packages.lib] +test_is_broken = true + +[packages."lib+default"] +test_is_broken = false diff --git a/src/rustix/debian/patches/disable-benches.diff b/src/rustix/debian/patches/disable-benches.diff new file mode 100644 index 000000000..750b670eb --- /dev/null +++ b/src/rustix/debian/patches/disable-benches.diff @@ -0,0 +1,23 @@ +Index: rustix/Cargo.toml +=================================================================== +--- rustix.orig/Cargo.toml ++++ rustix/Cargo.toml +@@ -44,6 +44,7 @@ categories = [ + ] + license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" + repository = "https://github.com/bytecodealliance/rustix" ++autobenches = false + + [package.metadata.docs.rs] + features = ["all-apis"] +@@ -58,10 +59,6 @@ targets = [ + "x86_64-pc-windows-msvc", + ] + +-[[bench]] +-name = "mod" +-harness = false +- + [dependencies.bitflags] + version = "1.2.1" + diff --git a/src/rustix/debian/patches/relax-dep.diff b/src/rustix/debian/patches/relax-dep.diff new file mode 100644 index 000000000..3617397c8 --- /dev/null +++ b/src/rustix/debian/patches/relax-dep.diff @@ -0,0 +1,13 @@ +Index: rustix/Cargo.toml +=================================================================== +--- rustix.orig/Cargo.toml ++++ rustix/Cargo.toml +@@ -98,7 +98,7 @@ package = "errno" + version = "0.6.5" + + [dev-dependencies.serial_test] +-version = "0.6" ++version = ">= 0.5, < 0.7" + + [dev-dependencies.tempfile] + version = "3.2.0" diff --git a/src/rustix/debian/patches/series b/src/rustix/debian/patches/series index 957b5e634..2aba7043c 100644 --- a/src/rustix/debian/patches/series +++ b/src/rustix/debian/patches/series @@ -3,3 +3,5 @@ drop-deps.diff drop-alloc.diff always-enable-cc.diff built-using.diff +disable-benches.diff +relax-dep.diff -- 2.39.5