From be298744f7405045092f70379f3fad18de70b3db Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Thu, 11 Jun 2020 17:49:22 -0700
Subject: [vcpkg] Merge unit test pass into x86-windows. (#11858)

---
 scripts/azure-pipelines/azure-pipelines.yml        |  4 ----
 .../azure-pipelines/windows/azure-pipelines.yml    | 16 ++++++++++++++
 scripts/azure-pipelines/windows/run-tests.yml      | 25 ----------------------
 3 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 scripts/azure-pipelines/windows/run-tests.yml

(limited to 'scripts')

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 7efc2df73..9379e06a0 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -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
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index 2c0afa920..274df268f 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -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 = @(
diff --git a/scripts/azure-pipelines/windows/run-tests.yml b/scripts/azure-pipelines/windows/run-tests.yml
deleted file mode 100644
index 6ea80ac2c..000000000
--- a/scripts/azure-pipelines/windows/run-tests.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-#
-# Builds and runs vcpkg-test.exe for PRs and CIs.
-
-jobs:
-- job: windows_tests
-  pool:
-    name: ${{ parameters.poolName }}
-  steps:
-  - task: CmdLine@2
-    displayName: "Build and Test vcpkg"
-    inputs:
-      script: |
-        :: TRANSITION, get these tools on the VMs next time we roll them
-        call .\bootstrap-vcpkg.bat
-        .\vcpkg.exe fetch cmake
-        .\vcpkg.exe fetch ninja
-        set PATH=downloads\tools\cmake-3.17.2-windows\cmake-3.17.2-win32-x86\bin;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
-- 
cgit v1.2.3