[NTOS:CM] In CmpParseKey(), do not assert but instead correctly return failure if...

[reactos.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index caf0f95..f4e1512 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,16 @@
 environment:
   matrix:
-    - BuildType: "clang-cl"
+    - BuildType: "msvc-x64"
     - BuildType: "msvc"
+    - BuildType: "clang-cl"
+#     - BuildType: vssolution
 
 version: reactos.appveyor.{build}
 skip_branch_with_pr: true
 clone_depth: 5
 clone_folder: c:\reactos-cov
+matrix: 
+  fast_finish: true
 
 init:
   - ps: (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/RosCMakeNinja.zip","C:\RosCMakeNinja.zip")
@@ -22,7 +26,11 @@ init:
 
 build_script:
   - set PATH=C:\RosCMakeNinja\bin;%PATH%
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+  - if "%BuildType%" == "msvc-x64" (
+        call "C:\PROGRA~2\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      ) else (
+        call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+      )
   - cmake --version
   - md c:\ros_build
   - cd c:\ros_build
@@ -34,3 +42,18 @@ build_script:
 
 test: off
 deploy: off
+
+for:
+-
+  matrix:
+    only:
+      - BuildType: vssolution
+
+  build_script:
+    - set PATH=C:\RosCMakeNinja\bin;%PATH%
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+    - cmake --version
+    - md C:\ros_build
+    - cd C:\ros_build
+    - call %APPVEYOR_BUILD_FOLDER%\configure.cmd VSSolution -DENABLE_ROSTESTS=1
+    - msbuild /verbosity:quiet /target:bootcd REACTOS.sln