diff options
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | ci/run.ps1 | 8 | ||||
| -rw-r--r-- | cross/arm64cl.txt | 17 | ||||
| -rw-r--r-- | cross/none.txt | 18 | ||||
| -rwxr-xr-x | run_cross_test.py | 9 |
5 files changed, 52 insertions, 5 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1ff542a..e4fe8b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,6 +56,11 @@ jobs: arch: x64 compiler: msvc2019 backend: vs2019 + vc2019arm64ninjacross: + arch: arm64 + compiler: msvc2019 + backend: ninja + extraargs: --cross arm64cl.txt --cross-only steps: - task: UsePythonVersion@0 @@ -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" diff --git a/cross/arm64cl.txt b/cross/arm64cl.txt new file mode 100644 index 0000000..2d7bf2d --- /dev/null +++ b/cross/arm64cl.txt @@ -0,0 +1,17 @@ +[binaries] +c = 'cl' +cpp = 'cl' +ar = 'lib' +windres = 'rc' + +[properties] +c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP'] +c_link_args = ['-APPCONTAINER', 'WindowsApp.lib'] +cpp_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP'] +cpp_link_args = ['-APPCONTAINER', 'WindowsApp.lib'] + +[host_machine] +system = 'windows' +cpu_family = 'aarch64' +cpu = 'armv8' +endian = 'little' diff --git a/cross/none.txt b/cross/none.txt new file mode 100644 index 0000000..8727e27 --- /dev/null +++ b/cross/none.txt @@ -0,0 +1,18 @@ +# native file used to make the build machine compiler unusable + +[host_machine] +system = 'none' +cpu_family = 'none' +cpu = 'none' +endian = 'little' + +[properties] + +[binaries] +c = ['false'] +cpp = ['false'] +objc = ['false'] +objcpp = ['false'] +ar = ['false'] +pkgconfig = ['false'] +cmake = ['false'] diff --git a/run_cross_test.py b/run_cross_test.py index 70db667..6cba324 100755 --- a/run_cross_test.py +++ b/run_cross_test.py @@ -29,7 +29,14 @@ def runtests(cross_file, failfast, cross_only): tests = ['--only', 'common'] if not cross_only: tests.append('native') - cmd = mesonlib.python_command + ['run_project_tests.py', '--backend', 'ninja'] + (['--failfast'] if failfast else []) + tests + ['--cross-file', cross_file] + cmd = mesonlib.python_command + ['run_project_tests.py', '--backend', 'ninja'] + if failfast: + cmd += ['--failfast'] + cmd += tests + cmd += ['--cross-file', cross_file] + cmd += ['--'] # args following this are passed directly to meson + if cross_only: + cmd += ['--native-file', 'cross/none.txt'] return subprocess.call(cmd) def main(): |