From d77a7103dcb6c5cb96f1f4bbf8fbf1a4789f060d Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 2 Sep 2021 19:43:42 +0000
Subject: build_llvm_package.bat: Support doing test builds

... from a random branch/sha1.

Change-Id: Id3a187ce548459c0f47f12ecb8bee6e2ef1b8aed
---
 build_llvm_package.bat | 17 ++++++++++++-----
 tcwg-llvm-release.bat  |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build_llvm_package.bat b/build_llvm_package.bat
index 47a51af3..1b265bca 100755
--- a/build_llvm_package.bat
+++ b/build_llvm_package.bat
@@ -4,7 +4,7 @@ setlocal
 REM Script for building the LLVM installer on Windows,
 REM used for the the weekly snapshots at http://www.llvm.org/builds.
 REM
-REM Usage: build_llvm_package.bat <revision>
+REM Usage: build_llvm_package.bat <revision> [test]
 
 REM Prerequisites:
 REM
@@ -27,9 +27,15 @@ set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36
 for /f "usebackq" %%i in (`PowerShell ^(Get-Date^).ToString^('yyyyMMdd'^)`) do set datestamp=%%i
 
 set revision=%1
-set package_version=%revision%
+
+if "%2" == "test" (
+    set git_ref=%revision%
+) else (
+    set git_ref=llvmorg-%revision%
+)
+set package_version=%revision:~0,8%
 set clang_format_vs_version=13.0.0.%datestamp%
-set build_dir=llvm_package_%revision%
+set build_dir=llvm_package_%package_version%
 
 echo Revision: %revision%
 echo Package version: %package_version%
@@ -41,8 +47,8 @@ REM pause
 mkdir %build_dir%
 cd %build_dir%
 
-echo Checking out %revision%
-curl -L https://github.com/llvm/llvm-project/archive/llvmorg-%revision%.zip -o src.zip || exit /b
+echo Checking out %git_ref%
+curl -L https://github.com/llvm/llvm-project/archive/%git_ref%.zip -o src.zip || exit /b
 7z x src.zip || exit /b
 mv llvm-project-* llvm-project || exit /b
 
@@ -64,6 +70,7 @@ REM TODO: Run the "check-all" tests.
 
 set "VSCMD_START_DIR=%CD%"
 call "%vsdevcmd%" -host_arch=x86 -arch=arm64
+@echo on
 set CC=clang-cl
 set CXX=clang-cl
 mkdir build32_stage0
diff --git a/tcwg-llvm-release.bat b/tcwg-llvm-release.bat
index 209e52fb..9e716f8b 100755
--- a/tcwg-llvm-release.bat
+++ b/tcwg-llvm-release.bat
@@ -5,6 +5,6 @@ mkdir artifacts
 REM For now we use a local copy of build_llvm_package.bat.
 REM We should merge our changes to upstream
 REM llvm/utils/release/build_llvm_package.bat script.
-call jenkins-scripts\build_llvm_package.bat %1%
+call jenkins-scripts\build_llvm_package.bat %1 %2 || exit /b
 
-cp LLVM-%1%-woa64.zip artifacts\
+cp LLVM-%1:~0,8%-woa64.zip artifacts\
-- 
cgit v1.2.3