Skip to content

Commit 5bd2c80

Browse files
committed
Fix for tests/run-make/no-builtins-attribute
1 parent 3f09406 commit 5bd2c80

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
# `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
5353
run: sudo apt-get install ninja-build ripgrep llvm-14-tools llvm libstdc++6
5454

55+
- run: g++ -v
56+
5557
- run: find / -name libstdc++.so | true
5658

5759
- name: Install rustfmt & clippy

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
uses: Swatinem/rust-cache@v2
3939

4040
- name: Install packages
41-
run: sudo apt-get install ninja-build ripgrep llvm libstdc++6
41+
# `llvm-14-tools` is needed to install the `FileCheck` binary which is used for run-make tests.
42+
run: sudo apt-get install ninja-build ripgrep llvm-14-tools llvm libstdc++6
4243

4344
- name: Download artifact
4445
run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-15.deb

build_system/src/test.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,14 +534,17 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<PathBuf, String> {
534534
which FileCheck-11 || \
535535
which FileCheck-12 || \
536536
which FileCheck-13 || \
537-
which FileCheck-14",
537+
which FileCheck-14 || \
538+
which FileCheck",
538539
],
539540
rust_dir,
540541
Some(env),
541542
) {
542543
Ok(cmd) => String::from_utf8_lossy(&cmd.stdout).to_string(),
543544
Err(_) => {
544545
eprintln!("Failed to retrieve LLVM FileCheck, ignoring...");
546+
// FIXME: the test tests/run-make/no-builtins-attribute will fail if we cannot find
547+
// FileCheck.
545548
String::new()
546549
}
547550
};

0 commit comments

Comments
 (0)