Skip to content

Commit

Permalink
Unrolled build for rust-lang#128807
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#128807 - ChrisDenton:bloat, r=jieyouxu

run-make: explaing why fmt-write-bloat is ignore-windows

The trouble here is that libc doesn't exist on Windows. Well it kinda does but it isn't called that so we substitute a name that works. Ideally finding necessary libs for the platform would be done at a higher level but until then this should work.

try-job: x86_64-msvc
try-job: x86_64-mingw
try-job: i686-msvc
try-job: i686-mingw
  • Loading branch information
rust-timer authored Aug 10, 2024
2 parents 8291d68 + ef90df6 commit 1e5bed4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/run-make/fmt-write-bloat/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use core::fmt;
use core::fmt::Write;

#[link(name = "c")]
#[cfg_attr(not(windows), link(name = "c"))]
extern "C" {}

struct Dummy;
Expand Down
7 changes: 5 additions & 2 deletions tests/run-make/fmt-write-bloat/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
//! `NO_DEBUG_ASSERTIONS=1`). If debug assertions are disabled, then we can check for the absence of
//! additional `usize` formatting and padding related symbols.

// Reason: This test is `ignore-windows` because the `no_std` test (using `#[link(name = "c")])`
// doesn't link on windows.
//@ ignore-windows
// Reason:
// - MSVC targets really need to parse the .pdb file (aka the debug information).
// On Windows there's an API for that (dbghelp) which maybe we can use
// - MinGW targets have a lot of symbols included in their runtime which we can't avoid.
// We would need to make the symbols we're looking for more specific for this test to work.
//@ ignore-cross-compile

use run_make_support::env::no_debug_assertions;
Expand Down

0 comments on commit 1e5bed4

Please sign in to comment.