1
Fork 0

Abi-checker got renamed to abi-cafe

This commit is contained in:
bjorn3 2022-09-26 13:56:18 +02:00
parent 27a1fd30d2
commit 7dccb51fe3
7 changed files with 18 additions and 17 deletions

1
.gitignore vendored
View file

@ -19,4 +19,5 @@ perf.data.old
/regex /regex
/simple-raytracer /simple-raytracer
/portable-simd /portable-simd
/abi-cafe
/abi-checker /abi-checker

View file

@ -14,17 +14,17 @@ pub(crate) fn run(
host_triple: &str, host_triple: &str,
target_triple: &str, target_triple: &str,
) { ) {
if !config::get_bool("testsuite.abi-checker") { if !config::get_bool("testsuite.abi-cafe") {
eprintln!("[SKIP] abi-checker"); eprintln!("[SKIP] abi-cafe");
return; return;
} }
if host_triple != target_triple { if host_triple != target_triple {
eprintln!("[SKIP] abi-checker (cross-compilation not supported)"); eprintln!("[SKIP] abi-cafe (cross-compilation not supported)");
return; return;
} }
eprintln!("Building sysroot for abi-checker"); eprintln!("Building sysroot for abi-cafe");
build_sysroot::build_sysroot( build_sysroot::build_sysroot(
channel, channel,
sysroot_kind, sysroot_kind,
@ -34,14 +34,14 @@ pub(crate) fn run(
target_triple, target_triple,
); );
eprintln!("Running abi-checker"); eprintln!("Running abi-cafe");
let mut abi_checker_path = env::current_dir().unwrap(); let mut abi_cafe_path = env::current_dir().unwrap();
abi_checker_path.push("abi-checker"); abi_cafe_path.push("abi-cafe");
env::set_current_dir(&abi_checker_path.clone()).unwrap(); env::set_current_dir(&abi_cafe_path.clone()).unwrap();
let pairs = ["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"]; let pairs = ["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"];
let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_checker_path); let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_cafe_path);
cmd.arg("--"); cmd.arg("--");
cmd.arg("--pairs"); cmd.arg("--pairs");
cmd.args(pairs); cmd.args(pairs);

View file

@ -4,7 +4,7 @@ use std::process;
use self::utils::is_ci; use self::utils::is_ci;
mod abi_checker; mod abi_cafe;
mod build_backend; mod build_backend;
mod build_sysroot; mod build_sysroot;
mod config; mod config;
@ -143,7 +143,7 @@ pub fn main() {
&target_triple, &target_triple,
); );
abi_checker::run( abi_cafe::run(
channel, channel,
sysroot_kind, sysroot_kind,
&target_dir, &target_dir,

View file

@ -14,12 +14,12 @@ pub(crate) fn prepare() {
Command::new("cargo").arg("install").arg("hyperfine").spawn().unwrap().wait().unwrap(); Command::new("cargo").arg("install").arg("hyperfine").spawn().unwrap().wait().unwrap();
clone_repo_shallow_github( clone_repo_shallow_github(
"abi-checker", "abi-cafe",
"Gankra", "Gankra",
"abi-checker", "abi-cafe",
"4c6dc8c9c687e2b3a760ff2176ce236872b37212", "4c6dc8c9c687e2b3a760ff2176ce236872b37212",
); );
apply_patches("abi-checker", Path::new("abi-checker")); apply_patches("abi-cafe", Path::new("abi-cafe"));
clone_repo_shallow_github( clone_repo_shallow_github(
"rand", "rand",

View file

@ -3,4 +3,4 @@ set -e
rm -rf build_sysroot/{sysroot_src/,target/,compiler-builtins/,rustc_version} rm -rf build_sysroot/{sysroot_src/,target/,compiler-builtins/,rustc_version}
rm -rf target/ build/ perf.data{,.old} y.bin rm -rf target/ build/ perf.data{,.old} y.bin
rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/ rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/ abi-cafe/

View file

@ -49,4 +49,4 @@ test.regex-shootout-regex-dna
test.regex test.regex
test.portable-simd test.portable-simd
testsuite.abi-checker testsuite.abi-cafe

View file

@ -1,7 +1,7 @@
From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001 From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001
From: Afonso Bordado <afonso360@users.noreply.github.com> From: Afonso Bordado <afonso360@users.noreply.github.com>
Date: Fri, 12 Aug 2022 22:51:58 +0000 Date: Fri, 12 Aug 2022 22:51:58 +0000
Subject: [PATCH] Disable abi-checker tests Subject: [PATCH] Disable abi-cafe tests
--- ---
src/report.rs | 14 ++++++++++++++ src/report.rs | 14 ++++++++++++++