Merged PR 679968: Add --use-adobuildrunner option to bxl.sh

.azdo/linux/job-selfhost.yml

@@ -147,9 +147,8 @@ jobs:
 
   - bash: |
       set -eu
-      chmod +x Out/Selfhost/Dev/AdoBuildRunner
       # the disks on Azure Pipeline VMs are too small to build everything, so let's instead run tests
-      ./Out/Selfhost/Dev/AdoBuildRunner bash bxl.sh --use-dev ${{ parameters.BxlCommonArgs }} /logsDirectory:"Out/Logs/${{ parameters.validationName }}" ${{ parameters.bxlExtraArgs }} "/f:tag='test' /p:BUILDXL_FINGERPRINT_SALT='KickLinuxDistributed_9_2_2022'"
+      ./bxl.sh --use-dev --use-adobuildrunner ${{ parameters.BxlCommonArgs }} /logsDirectory:"Out/Logs/${{ parameters.validationName }}" ${{ parameters.bxlExtraArgs }} "/f:tag='test' /p:BUILDXL_FINGERPRINT_SALT='KickLinuxDistributed_9_2_2022'"
     displayName: Test (${{ parameters.validationName }})
     workingDirectory: /home/subst
     env:

Public/Src/Sandbox/MacOs/scripts/bxl.sh

@@ -21,6 +21,7 @@ declare arg_SymlinkSdksInto=""
 declare arg_checkKextLogInterval=""
 declare arg_loadKext=""
 declare arg_installDaemon=""
+declare arg_useAdoBuildRunner=""
 
 declare g_bxlCmdArgs=()
 
@@ -194,9 +195,17 @@ function build {
     local bxlExe="$arg_BuildXLBin/bxl"
     chmod u=rx "$bxlExe" || true # could already be executable
 
-    print_info "${tputBold}Running bxl:${tputReset} '$bxlExe' ${g_bxlCmdArgs[@]}"
+    if [[ -n "$arg_useAdoBuildRunner" ]]; then
+        local adoBuildRunnerExe="$arg_BuildXLBin/AdoBuildRunner"
+        chmod u=rx "$adoBuildRunnerExe" || true
+        print_info "${tputBold}Running AdoBuildRunner:${tputReset} '$adoBuildRunnerExe' '$bxlExe' ${g_bxlCmdArgs[@]}"
 
-    "$bxlExe" "${g_bxlCmdArgs[@]}"
+        "$adoBuildRunnerExe" "$bxlExe" "${g_bxlCmdArgs[@]}"
+    else
+        print_info "${tputBold}Running bxl:${tputReset} '$bxlExe' ${g_bxlCmdArgs[@]}"
+
+        "$bxlExe" "${g_bxlCmdArgs[@]}"
+    fi
     local bxlExitCode=$?
 
     if [[ $bxlExitCode == 0 ]]; then
@@ -269,6 +278,10 @@ function parseArgs {
                 arg_installDaemon="1"
                 shift
                 ;;
+            --use-adobuildrunner)
+                arg_useAdoBuildRunner="1"
+                shift
+                ;;
             *)
                 arg_Positional+=("$1")
                 shift

bxl.sh

@@ -150,6 +150,10 @@ function parseArgs() {
             arg_Positional+=("/p:[Sdk.BuildXL]useManagedSharedCompilation=1")
             shift
             ;;
+        --use-adobuildrunner)
+            arg_Positional+=("--use-adobuildrunner")
+            shift
+            ;;
         --vs)
             arg_Positional+=(
                 "/vs"
@@ -327,4 +331,4 @@ if [[ -n "$arg_DeployDevRelease" ]]; then
     deployBxl "$MY_DIR/Out/Bin/release/${DeploymentFolder}" "$MY_DIR/Out/Selfhost/Dev"
 fi
 
-popd
+popd