blob: 8a6f5691f0db6c39c8a02fe10e21bca9573a1434 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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(
|
