Skip to content

Commit

Permalink
tests/run-make: add missing needs-llvm-components
Browse files Browse the repository at this point in the history
Without suitable `needs-llvm-components` directives, these tests that
rely on target-specific codegen can fail if used with a LLVM that is
built without the required components.
  • Loading branch information
jieyouxu committed Aug 26, 2024
1 parent 92b1081 commit beaf9d1
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 11 deletions.
5 changes: 5 additions & 0 deletions tests/run-make/print-cfg/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
//!
//! It also checks that some targets have the correct set cfgs.

// ignore-tidy-linelength
//@ needs-llvm-components: arm x86
// Note: without the needs-llvm-components it will fail on LLVM built without the required
// components listed above.

use std::collections::HashSet;
use std::iter::FromIterator;
use std::path::PathBuf;
Expand Down
13 changes: 9 additions & 4 deletions tests/run-make/print-target-list/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
// Checks that all the targets returned by `rustc --print target-list` are valid
// target specifications
// Checks that all the targets returned by `rustc --print target-list` are valid target
// specifications.

// ignore-tidy-linelength
//@ needs-llvm-components: aarch64 arm avr bpf csky hexagon loongarch m68k mips msp430 nvptx powerpc riscv sparc systemz webassembly x86
// FIXME(jieyouxu): there has to be a better way to do this, without the needs-llvm-components it
// will fail on LLVM built without all of the components listed above.

use run_make_support::bare_rustc;

// FIXME(127877): certain experimental targets fail with creating a 'LLVM TargetMachine'
// in CI, so we skip them
// FIXME(#127877): certain experimental targets fail with creating a 'LLVM TargetMachine' in CI, so
// we skip them.
const EXPERIMENTAL_TARGETS: &[&str] = &["avr", "m68k", "csky", "xtensa"];

fn main() {
Expand Down
10 changes: 8 additions & 2 deletions tests/run-make/print-to-output/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
//! This checks the output of some `--print` options when
//! output to a file (instead of stdout)
//! This checks the output of some `--print` options when output to a file (instead of stdout)

// ignore-tidy-linelength
//@ needs-llvm-components: aarch64 arm avr bpf csky hexagon loongarch m68k mips msp430 nvptx powerpc riscv sparc systemz webassembly x86
// FIXME(jieyouxu): there has to be a better way to do this, without the needs-llvm-components it
// will fail on LLVM built without all of the components listed above. If adding a new target that
// relies on a llvm component not listed above, it will need to be added to the required llvm
// components above.

use std::path::PathBuf;

Expand Down
15 changes: 10 additions & 5 deletions tests/run-make/target-without-atomic-cas/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
// ARM Cortex-M are a class of processors supported by the rust compiler. However,
// they cannot support any atomic features, such as Arc. This test simply prints
// the configuration details of one Cortex target, and checks that the compiler
// does not falsely list atomic support.
// See https://github.com/rust-lang/rust/pull/36874
// ARM Cortex-M are a class of processors supported by the rust compiler. However, they cannot
// support any atomic features, such as Arc. This test simply prints the configuration details of
// one Cortex target, and checks that the compiler does not falsely list atomic support.
// See <https://github.com/rust-lang/rust/pull/36874>.

// ignore-tidy-linelength
//@ needs-llvm-components: arm
// Note: without the needs-llvm-components it will fail on LLVM built without all of the components
// listed above. If any new targets are added, please double-check their respective llvm components
// are specified above.

use run_make_support::rustc;

Expand Down

0 comments on commit beaf9d1

Please sign in to comment.