From c4b6e9bb475deea7a90d85de8bc42abc72ae6978 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Sat, 21 May 2016 14:49:25 -0700
Subject: [PATCH] appveyor.yml: improve build process

---
 appveyor.yml         |  8 ++++----
 tools/build.bat      |  4 ++--
 tools/nmake-test.bat | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 tools/nmake-test.bat

diff --git a/appveyor.yml b/appveyor.yml
index 54d8888b..846c305a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,18 +8,18 @@ environment:
   CONFIGURATION: Release
 
 install:
-- git submodule update --init
-- appveyor AddMessage "Set testsigning on and reboot" -Category Information
+- git submodule update --init --recursive
+- appveyor AddMessage "Change boot configuration and reboot" -Category Information
 - bcdedit /set testsigning on
 - ps: Restart-Computer -Force
 - ps: Start-Sleep -s 10
 
 build_script:
 - appveyor AddMessage "Reboot complete" -Category Information
-- bcdedit | find /i "testsigning"
+- bcdedit | findstr /i "testsigning"
 - tools\build.bat %CONFIGURATION%
-- cd ext\test && nmake /f Nmakefile
 
 test_script:
 - for %%f in ("build\VStudio\build\%CONFIGURATION%\winfsp-*.msi") do start /wait msiexec /i %%f /qn INSTALLLEVEL=1000
+- tools\nmake-test.bat %CONFIGURATION%
 - tools\run-tests.bat %CONFIGURATION%
diff --git a/tools/build.bat b/tools/build.bat
index 53d026e8..c7e5bef4 100644
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -8,10 +8,10 @@ set CrossCert="%~dp0DigiCert High Assurance EV Root CA.crt"
 set Issuer="DigiCert"
 set Subject="Navimatics Corporation"
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
-
 if not X%1==X set Configuration=%1
 
+call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+
 cd %~dp0..\build\VStudio
 if exist build\ del /s/q build >nul
 
diff --git a/tools/nmake-test.bat b/tools/nmake-test.bat
new file mode 100644
index 00000000..756eea51
--- /dev/null
+++ b/tools/nmake-test.bat
@@ -0,0 +1,11 @@
+@echo off
+
+setlocal
+
+set Configuration=Release
+if not X%1==X set Configuration=%1
+
+call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+
+cd %~dp0..\ext\test
+nmake /f Nmakefile