From a0eb8460a9436e368dfb8af7dffdb4811789ca4d Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sat, 7 Dec 2019 10:33:01 -0800
Subject: appveyor: fixed test running command

---
 BuildTools/Scripts/appveyor/run_tests.bat | 28 ++++++++++++++++++++++++++++
 appveyor.yml                              |  9 +--------
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 BuildTools/Scripts/appveyor/run_tests.bat

diff --git a/BuildTools/Scripts/appveyor/run_tests.bat b/BuildTools/Scripts/appveyor/run_tests.bat
new file mode 100644
index 00000000..fd56f267
--- /dev/null
+++ b/BuildTools/Scripts/appveyor/run_tests.bat
@@ -0,0 +1,28 @@
+@echo off
+
+set RUN_API_CORE_TEST=false
+set RUN_CORE_API_D3D11_TEST=false
+set set RUN_D3D12_TEST=false
+
+if "%PLATFORM_NAME%"=="Windows" (
+    set RUN_API_CORE_TEST=true
+    set RUN_CORE_API_D3D11_TEST=true
+    set RUN_CORE_API_D3D12_TEST=true
+)
+
+if "%PLATFORM_NAME%"=="Windows8.1" (
+    set RUN_API_CORE_TEST=true
+    set RUN_CORE_API_D3D11_TEST=true
+)
+
+if "%RUN_API_CORE_TEST%"=="true" (
+    "%1\UnitTests\DiligentCoreTest\%CONFIGURATION%\DiligentCoreTest.exe"
+)
+
+if "%RUN_CORE_API_D3D11_TEST%"=="true" (
+    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d11_sw
+)
+
+if "%RUN_CORE_API_D3D12_TEST%"=="true" (
+    "%1\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe" --mode=d3d12_sw
+)
diff --git a/appveyor.yml b/appveyor.yml
index 21ab27e1..dcbe51d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -75,14 +75,7 @@ build:
   parallel: true
 
 test_script:
-  - |
-    if "%PLATFORM_NAME%"=="Windows" OR "%PLATFORM_NAME%"=="Windows8.1" (
-      C:\projects\DiligentCore\build\UnitTests\DiligentCoreTest\%CONFIGURATION%\DiligentCoreTest.exe
-      C:\projects\DiligentCore\build\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe --mode=d3d11_sw
-      if "%PLATFORM_NAME%"=="Windows" (
-        C:\projects\DiligentCore\build\UnitTests\DiligentCoreAPITest\%CONFIGURATION%\DiligentCoreAPITest.exe --mode=d3d12_sw
-      )
-    )
+  - c:\projects\DiligentCore\BuildTools\Scripts\appveyor\run_tests.bat "C:\projects\DiligentCore\build"
 
 after_test:
   - cd install
-- 
cgit v1.2.3