Skip to content

Commit 7dccb51

Browse files
committed
Abi-checker got renamed to abi-cafe
1 parent 27a1fd3 commit 7dccb51

File tree

7 files changed

+18
-17
lines changed

7 files changed

+18
-17
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ perf.data.old
1919
/regex
2020
/simple-raytracer
2121
/portable-simd
22+
/abi-cafe
2223
/abi-checker

build_system/abi_checker.rs renamed to build_system/abi_cafe.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ pub(crate) fn run(
1414
host_triple: &str,
1515
target_triple: &str,
1616
) {
17-
if !config::get_bool("testsuite.abi-checker") {
18-
eprintln!("[SKIP] abi-checker");
17+
if !config::get_bool("testsuite.abi-cafe") {
18+
eprintln!("[SKIP] abi-cafe");
1919
return;
2020
}
2121

2222
if host_triple != target_triple {
23-
eprintln!("[SKIP] abi-checker (cross-compilation not supported)");
23+
eprintln!("[SKIP] abi-cafe (cross-compilation not supported)");
2424
return;
2525
}
2626

27-
eprintln!("Building sysroot for abi-checker");
27+
eprintln!("Building sysroot for abi-cafe");
2828
build_sysroot::build_sysroot(
2929
channel,
3030
sysroot_kind,
@@ -34,14 +34,14 @@ pub(crate) fn run(
3434
target_triple,
3535
);
3636

37-
eprintln!("Running abi-checker");
38-
let mut abi_checker_path = env::current_dir().unwrap();
39-
abi_checker_path.push("abi-checker");
40-
env::set_current_dir(&abi_checker_path.clone()).unwrap();
37+
eprintln!("Running abi-cafe");
38+
let mut abi_cafe_path = env::current_dir().unwrap();
39+
abi_cafe_path.push("abi-cafe");
40+
env::set_current_dir(&abi_cafe_path.clone()).unwrap();
4141

4242
let pairs = ["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"];
4343

44-
let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_checker_path);
44+
let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_cafe_path);
4545
cmd.arg("--");
4646
cmd.arg("--pairs");
4747
cmd.args(pairs);

build_system/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::process;
44

55
use self::utils::is_ci;
66

7-
mod abi_checker;
7+
mod abi_cafe;
88
mod build_backend;
99
mod build_sysroot;
1010
mod config;
@@ -143,7 +143,7 @@ pub fn main() {
143143
&target_triple,
144144
);
145145

146-
abi_checker::run(
146+
abi_cafe::run(
147147
channel,
148148
sysroot_kind,
149149
&target_dir,

build_system/prepare.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ pub(crate) fn prepare() {
1414
Command::new("cargo").arg("install").arg("hyperfine").spawn().unwrap().wait().unwrap();
1515

1616
clone_repo_shallow_github(
17-
"abi-checker",
17+
"abi-cafe",
1818
"Gankra",
19-
"abi-checker",
19+
"abi-cafe",
2020
"4c6dc8c9c687e2b3a760ff2176ce236872b37212",
2121
);
22-
apply_patches("abi-checker", Path::new("abi-checker"));
22+
apply_patches("abi-cafe", Path::new("abi-cafe"));
2323

2424
clone_repo_shallow_github(
2525
"rand",

clean_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set -e
33

44
rm -rf build_sysroot/{sysroot_src/,target/,compiler-builtins/,rustc_version}
55
rm -rf target/ build/ perf.data{,.old} y.bin
6-
rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/
6+
rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/ abi-cafe/

config.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ test.regex-shootout-regex-dna
4949
test.regex
5050
test.portable-simd
5151

52-
testsuite.abi-checker
52+
testsuite.abi-cafe

patches/0001-abi-checker-Disable-failing-tests.patch renamed to patches/0001-abi-cafe-Disable-failing-tests.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001
22
From: Afonso Bordado <[email protected]>
33
Date: Fri, 12 Aug 2022 22:51:58 +0000
4-
Subject: [PATCH] Disable abi-checker tests
4+
Subject: [PATCH] Disable abi-cafe tests
55

66
---
77
src/report.rs | 14 ++++++++++++++

0 commit comments

Comments
 (0)