Only run abi-cafe on cg_clif's CI

Author: bjorn3

.github/workflows/main.yml

@@ -114,6 +114,14 @@ jobs:
         TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
       run: ./y.rs test
 
+    - name: Test abi-cafe
+      env:
+        TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
+      run: |
+        if [[ "$(rustc -vV | grep host | cut -d' ' -f2)" == "$TARGET_TRIPLE" ]]; then
+          ./y.rs abi-cafe
+        fi
+
     - name: Package prebuilt cg_clif
       run: tar cvfJ cg_clif.tar.xz dist
 

build_system/abi_cafe.rs

@@ -1,7 +1,6 @@
 use std::path::Path;
 
 use super::build_sysroot;
-use super::config;
 use super::path::Dirs;
 use super::prepare::GitRepo;
 use super::utils::{spawn_and_wait, CargoProject, Compiler};
@@ -20,11 +19,6 @@ pub(crate) fn run(
     cg_clif_dylib: &Path,
     bootstrap_host_compiler: &Compiler,
 ) {
-    if !config::get_bool("testsuite.abi-cafe") {
-        eprintln!("[RUN] abi-cafe (skipped)");
-        return;
-    }
-
     eprintln!("Building sysroot for abi-cafe");
     build_sysroot::build_sysroot(
         dirs,

build_system/mod.rs

@@ -32,6 +32,7 @@ enum Command {
     Prepare,
     Build,
     Test,
+    AbiCafe,
     Bench,
 }
 
@@ -61,6 +62,7 @@ pub fn main() {
         Some("prepare") => Command::Prepare,
         Some("build") => Command::Build,
         Some("test") => Command::Test,
+        Some("abi-cafe") => Command::AbiCafe,
         Some("bench") => Command::Bench,
         Some(flag) if flag.starts_with('-') => arg_error!("Expected command found flag {}", flag),
         Some(command) => arg_error!("Unknown command {}", command),
@@ -156,19 +158,13 @@ pub fn main() {
                 &bootstrap_host_compiler,
                 target_triple.clone(),
             );
-
-            if bootstrap_host_compiler.triple == target_triple {
-                abi_cafe::run(
-                    channel,
-                    sysroot_kind,
-                    &dirs,
-                    &cg_clif_dylib,
-                    &bootstrap_host_compiler,
-                );
-            } else {
-                eprintln!("[RUN] abi-cafe (skipped, cross-compilation not supported)");
-                return;
+        }
+        Command::AbiCafe => {
+            if bootstrap_host_compiler.triple != target_triple {
+                eprintln!("Abi-cafe doesn't support cross-compilation");
+                process::exit(1);
             }
+            abi_cafe::run(channel, sysroot_kind, &dirs, &cg_clif_dylib, &bootstrap_host_compiler);
         }
         Command::Build => {
             build_sysroot::build_sysroot(

build_system/usage.txt

@@ -4,6 +4,7 @@ USAGE:
     ./y.rs prepare [--out-dir DIR]
     ./y.rs build [--debug] [--sysroot none|clif|llvm] [--out-dir DIR] [--no-unstable-features]
     ./y.rs test [--debug] [--sysroot none|clif|llvm] [--out-dir DIR] [--no-unstable-features]
+    ./y.rs abi-cafe [--debug] [--sysroot none|clif|llvm] [--out-dir DIR] [--no-unstable-features]
     ./y.rs bench [--debug] [--sysroot none|clif|llvm] [--out-dir DIR] [--no-unstable-features]
 
 OPTIONS:

config.txt

@@ -49,5 +49,3 @@ test.libcore
 test.regex-shootout-regex-dna
 test.regex
 test.portable-simd
-
-testsuite.abi-cafe