From: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Date: Sat, 19 Nov 2022 09:24:08 +0000 (+0100)
Subject: [PATCH] tests: add missing cross disabled checks
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-2+rpi1~6^2^2~45
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12ec71dc0ee54dc141e4a34921caa0df1f1f5946;p=rustc.git

[PATCH] tests: add missing cross disabled checks

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>

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-0003-tests-add-missing-cross-disabled-checks.patch
---

diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs
index 280575ec6a..c66dc874a4 100644
--- a/src/tools/cargo/tests/testsuite/build_script.rs
+++ b/src/tools/cargo/tests/testsuite/build_script.rs
@@ -739,6 +739,9 @@ fn custom_build_linker_bad_host_with_arch() {
 #[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(
@@ -777,6 +780,9 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() {
 #[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(