fish: Add new test desktop to build functions

Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · May 1, 2024 · faf1a5a · faf1a5a
1 parent 0f7bb26
commit faf1a5a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/fish/functions/cbl_bld_all_krnl.fish b/fish/functions/cbl_bld_all_krnl.fish
@@ -50,10 +50,16 @@ function cbl_bld_all_krnl -d "Build all kernels for ClangBuiltLinux testing"
         case test-desktop-amd test-desktop-intel-n100 test-laptop-intel
             cbl_test_kvm build
 
+            if test -e $CBL_TC_LLVM/clang
+                set tc_arg LLVM=1
+            else
+                set tc_arg (korg_llvm var)
+            fi
+
             kmake \
                 -C $CBL_SRC_C/linux \
                 KCONFIG_ALLCONFIG=(echo CONFIG_WERROR=n | psub) \
-                LLVM=1 \
+                $tc_arg \
                 O=(tbf linux)/(uname -m) \
                 distclean allmodconfig all
 

diff --git a/fish/functions/cbl_bld_tot_tcs.fish b/fish/functions/cbl_bld_tot_tcs.fish
@@ -52,11 +52,11 @@ function cbl_bld_tot_tcs -d "Build LLVM and binutils from source for kernel deve
             set pgo kernel-{allmod,def}config
             set targets X86
 
-        case test-laptop-intel
+        case test-desktop-intel-n100 test-laptop-intel
             set bld_bntls false
             set bld_stage_one_only true
             set projects clang lld
-            set targets X86
+            set targets AArch64 ARM X86
 
         case vm
             set bld_bntls false

diff --git a/fish/functions/cbl_test_kvm.fish b/fish/functions/cbl_test_kvm.fish
@@ -25,7 +25,18 @@ function cbl_test_kvm -d "Test KVM against a Clang built kernel with QEMU"
 
             cbl_upd_src_c m
 
-            kmake -C $src LLVM=1 O=$out distclean defconfig all; or return
+            if test -e $CBL_TC_LLVM/clang
+                set tc_arg LLVM=1
+            else
+                korg_llvm install \
+                    --clean-up-old-versions \
+                    --versions $LLVM_VERSION_STABLE
+                set tc_arg (korg_llvm var)
+            fi
+
+            kmake -C $src $tc_arg O=$out distclean defconfig all
+            or return
+
             kboot -a $arch -k $src/$out -t 45s
 
         case nested