From 6a56291a2a7dc5ea1443f29f3715c7491152f034 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 4 Dec 2018 20:12:20 +0000 Subject: Add a test run of MSVC ARM64 cross on Windows x64 Add a cross-file for MSVC UWP ARM64. Bump cidata tag to get an updated install.ps1 script (run by run.ps1) which sets the vcvars environment correctly when cross-compiling. Since arranging the correct environment for simultaneous cross and native 'cl' use is hard, this is test run uses '--cross-only' so we don't require a native compiler. Extend '--cross-only' so it also explicitly uses a machine file which makes all build machine compilers unusable. --- ci/run.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ci') diff --git a/ci/run.ps1 b/ci/run.ps1 index 5065b8749..424af72e7 100644 --- a/ci/run.ps1 +++ b/ci/run.ps1 @@ -34,10 +34,10 @@ function DownloadFile([String] $Source, [String] $Destination) { } -if ($env:backend -eq 'ninja') { $dmd = $true } else { $dmd = $false } +if (($env:backend -eq 'ninja') -and ($env:arch -ne 'arm64')) { $dmd = $true } else { $dmd = $false } -DownloadFile -Source https://github.com/mesonbuild/cidata/releases/download/ci2/ci_data.zip -Destination $env:AGENT_WORKFOLDER\ci_data.zip -echo "Extracting ci_data.zip" +DownloadFile -Source https://github.com/mesonbuild/cidata/releases/download/ci3/ci_data.zip -Destination $env:AGENT_WORKFOLDER\ci_data.zip +echo "Extracting ci_data.zip" Expand-Archive $env:AGENT_WORKFOLDER\ci_data.zip -DestinationPath $env:AGENT_WORKFOLDER\ci_data & "$env:AGENT_WORKFOLDER\ci_data\install.ps1" -Arch $env:arch -Compiler $env:compiler -Boost $true -DMD $dmd @@ -75,4 +75,4 @@ echo "=== Start running tests ===" # Starting from VS2019 Powershell(?) will fail the test run # if it prints anything to stderr. Python's test runner # does that by default so we need to forward it. -cmd /c 'python 2>&1' run_tests.py --backend $env:backend +cmd /c "python 2>&1 run_tests.py --backend $env:backend $env:extraargs" -- cgit v1.2.3