Skip to content

Commit

Permalink
[vcpkg] Merge unit test pass into x86-windows. (#11858)
Browse files Browse the repository at this point in the history
  • Loading branch information
BillyONeal authored Jun 12, 2020
1 parent 9efc131 commit be29874
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 29 deletions.
4 changes: 0 additions & 4 deletions scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ stages:
displayName: 'Run PR Test'
dependsOn: delete_tombstones
jobs:
- template: windows/run-tests.yml
parameters:
poolName: $(windows-pool)

- template: windows/azure-pipelines.yml
parameters:
triplet: x86-windows
Expand Down
16 changes: 16 additions & 0 deletions scripts/azure-pipelines/windows/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ jobs:
script: |
set VCPKG_DOWNLOADS=D:\downloads
.\bootstrap-vcpkg.bat
- task: CmdLine@2
displayName: "Build vcpkg with CMake and Run Tests"
condition: eq('${{ parameters.triplet }}', 'x86-windows')
inputs:
script: |
:: TRANSITION, get these tools on the VMs next time we roll them
set VCPKG_DOWNLOADS=D:\downloads
.\vcpkg.exe fetch cmake
.\vcpkg.exe fetch ninja
set PATH=D:\downloads\tools\cmake-3.17.2-windows\cmake-3.17.2-win32-x86\bin;D:\downloads\tools\ninja-1.10.0-windows;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86
rmdir /s /q build.x86.debug > nul 2> nul
cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc
ninja.exe -C build.x86.debug
build.x86.debug\vcpkg-test.exe
failOnStderr: true
- powershell: |
$env:VCPKG_DOWNLOADS='D:\downloads'
$commonArgs = @(
Expand Down
25 changes: 0 additions & 25 deletions scripts/azure-pipelines/windows/run-tests.yml

This file was deleted.

0 comments on commit be29874

Please sign in to comment.