diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
commit | c29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch) | |
tree | a2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch | |
parent | Merging upstream version 1.76.0+dfsg1. (diff) | |
download | rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.tar.xz rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.zip |
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch')
-rw-r--r-- | debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch b/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch deleted file mode 100644 index e3a6397d5..000000000 --- a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch +++ /dev/null @@ -1,46 +0,0 @@ -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(+) - -diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs -index 902364dff..e458b3262 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 - #[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( --- -2.38.1 - |