summaryrefslogtreecommitdiffstats
path: root/debian/patches/0003-tests-add-missing-cross-disabled-checks.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:47:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:47:57 +0000
commitb6541ea3807ccad597d4890b1a1eeb335f1268ac (patch)
treeacc0b1519e8ee04e2dfe584301d4884a80004831 /debian/patches/0003-tests-add-missing-cross-disabled-checks.patch
parentAdding upstream version 0.70.1+ds1. (diff)
downloadcargo-b6541ea3807ccad597d4890b1a1eeb335f1268ac.tar.xz
cargo-b6541ea3807ccad597d4890b1a1eeb335f1268ac.zip
Adding debian version 0.70.1+ds1-2.debian/0.70.1+ds1-2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/0003-tests-add-missing-cross-disabled-checks.patch')
-rw-r--r--debian/patches/0003-tests-add-missing-cross-disabled-checks.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/0003-tests-add-missing-cross-disabled-checks.patch b/debian/patches/0003-tests-add-missing-cross-disabled-checks.patch
new file mode 100644
index 0000000..8a6f569
--- /dev/null
+++ b/debian/patches/0003-tests-add-missing-cross-disabled-checks.patch
@@ -0,0 +1,43 @@
+From 981279ccd8f7855faaed010bff0891afff588210 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?=
+ <debian@fabian.gruenbichler.email>
+Date: Sat, 19 Nov 2022 10:24:08 +0100
+Subject: [PATCH] tests: add missing cross disabled checks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+cross_conmpile::alternate states it should only be used in test cases
+after checking cross_compile::disabled(), which is missing here. these
+tests fail despite setting CFG_DISABLE_CROSS_TESTS on i386, since both
+the host and the alternate cross target would be i686 in that case.
+
+Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
+---
+ tests/testsuite/build_script.rs | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: cargo/tests/testsuite/build_script.rs
+===================================================================
+--- cargo.orig/tests/testsuite/build_script.rs
++++ cargo/tests/testsuite/build_script.rs
+@@ -697,6 +697,9 @@ fn custom_build_linker_bad_host_with_arc
+ #[cargo_test]
+ fn custom_build_env_var_rustc_linker_cross_arch_host() {
+ let target = rustc_host();
++ if cross_compile::disabled() {
++ return;
++ }
+ let cross_target = cross_compile::alternate();
+ let p = project()
+ .file(
+@@ -735,6 +738,9 @@ fn custom_build_env_var_rustc_linker_cro
+ #[cargo_test]
+ fn custom_build_linker_bad_cross_arch_host() {
+ let target = rustc_host();
++ if cross_compile::disabled() {
++ return;
++ }
+ let cross_target = cross_compile::alternate();
+ let p = project()
+ .file(