diff options
| author | Afonso Bordado <afonsobordado@az8.co> | 2022-08-12 21:47:36 +0100 |
|---|---|---|
| committer | Afonso Bordado <afonsobordado@az8.co> | 2022-08-12 21:47:36 +0100 |
| commit | 0706df5f8cfd5bdd164d10bb67facc2a6c5f6b8f (patch) | |
| tree | 3bd375041bcc8d539ea9816a1bfe79e379858d7e | |
| parent | 7610be478f9e67a4e0e13cddb50f171e82cc3170 (diff) | |
| download | rust-0706df5f8cfd5bdd164d10bb67facc2a6c5f6b8f.tar.gz rust-0706df5f8cfd5bdd164d10bb67facc2a6c5f6b8f.zip | |
Update abi-checker version
| -rw-r--r-- | build_system/abi_checker.rs | 12 | ||||
| -rw-r--r-- | build_system/prepare.rs | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/build_system/abi_checker.rs b/build_system/abi_checker.rs index b6dc0fa6922..67dbd0a38a4 100644 --- a/build_system/abi_checker.rs +++ b/build_system/abi_checker.rs @@ -1,6 +1,6 @@ use super::build_sysroot; use super::config; -use super::utils::spawn_and_wait_with_input; +use super::utils::spawn_and_wait; use build_system::SysrootKind; use std::env; use std::path::Path; @@ -56,13 +56,5 @@ pub(crate) fn run( cmd.arg("--add-rustc-codegen-backend"); cmd.arg(format!("cgclif:{}", cg_clif_dylib_path.display())); - let output = spawn_and_wait_with_input(cmd, "".to_string()); - - // TODO: The correct thing to do here is to check the exit code, but abi-checker - // currently doesn't return 0 on success, so check for the test fail count. - // See: https://github.com/Gankra/abi-checker/issues/10 - let failed = !(output.contains("0 failed") && output.contains("0 completely failed")); - if failed { - panic!("abi-checker failed!"); - } + spawn_and_wait(cmd); } diff --git a/build_system/prepare.rs b/build_system/prepare.rs index 12aafdc1fb3..24a233d3806 100644 --- a/build_system/prepare.rs +++ b/build_system/prepare.rs @@ -18,7 +18,7 @@ pub(crate) fn prepare() { "abi-checker", "Gankra", "abi-checker", - "7c1571da6e43f9a37347623e7d5c7d51be664a7b", + "a2232d45f202846f5c02203c9f27355360f9a2ff", ); clone_repo_shallow_github( |