diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch (renamed from debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch) | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch b/debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch index e3a6397d5..fef435fc6 100644 --- a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch +++ b/debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch @@ -1,10 +1,8 @@ -From 981279ccd8f7855faaed010bff0891afff588210 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= - <debian@fabian.gruenbichler.email> +From: =?utf-8?q?Fabian_Gr=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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit cross_conmpile::alternate states it should only be used in test cases @@ -12,16 +10,17 @@ 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 ++++++ + src/tools/cargo/tests/testsuite/build_script.rs | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs -index 902364dff..e458b3262 100644 +diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs +index f7361fc..f587ddd 100644 --- a/src/tools/cargo/tests/testsuite/build_script.rs +++ b/src/tools/cargo/tests/testsuite/build_script.rs -@@ -697,6 +697,9 @@ fn custom_build_linker_bad_host_with_arc +@@ -734,6 +734,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(); @@ -31,7 +30,7 @@ index 902364dff..e458b3262 100644 let cross_target = cross_compile::alternate(); let p = project() .file( -@@ -735,6 +738,9 @@ fn custom_build_env_var_rustc_linker_cro +@@ -772,6 +775,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(); @@ -41,6 +40,3 @@ index 902364dff..e458b3262 100644 let cross_target = cross_compile::alternate(); let p = project() .file( --- -2.38.1 - |