Browse Source

Change Appveyor to do Release build (#1200)

Also changed to use the build project from antiagainst's account.
Lei Zhang 7 years ago
parent
commit
35d0aeae20

+ 3 - 1
README.md

@@ -1,6 +1,6 @@
 # DirectX Shader Compiler
 
-[![Build status](https://ci.appveyor.com/api/projects/status/5cwy3b8y1oi71lvl?svg=true)](https://ci.appveyor.com/project/marcelolr/directxshadercompiler)
+[![Build status](https://ci.appveyor.com/api/projects/status/oaf66n7w30xbrg38/branch/master?svg=true)](https://ci.appveyor.com/project/antiagainst/directxshadercompiler/branch/master)
 
 The DirectX Shader Compiler project includes a compiler and related tools used to compile High-Level Shader Language (HLSL) programs into DirectX Intermediate Language (DXIL) representation. Applications that make use of DirectX for graphics, games, and computation can use it to generate shader programs.
 
@@ -28,6 +28,8 @@ As an example of community contribution, this project can also target the [SPIR-
 
 ## Building Sources
 
+Note: Instead of building manually, you can download the artifacts built by Appveyor for the latest master branch at [here](https://ci.appveyor.com/project/antiagainst/directxshadercompiler/branch/master/artifacts).
+
 Before you build, you will need to have some additional software installed. This is the most straightforward path - see [Building Sources](https://github.com/Microsoft/DirectXShaderCompiler/wiki/Building-Sources) on the Wiki for more options, including Visual Studio 2015 and Ninja support.
 
 * [Git](http://git-scm.com/downloads).

+ 2 - 2
appveyor.yml

@@ -2,7 +2,7 @@ version: 1.0.{build}
 
 image: Visual Studio 2017
 platform: x64
-configuration: Debug
+configuration: Release
 
 clone_folder: c:\projects\DirectXShaderCompiler
 clone_depth: 1
@@ -22,7 +22,7 @@ build_script:
 
 test_script:
 - ps:  utils\appveyor\appveyor_test.ps1
-- cmd: call utils\hct\hcttest spirv_only
+- cmd: call utils\hct\hcttest -rel spirv_only
 
 after_test:
 - cmd: cd build\%CONFIGURATION%\bin

+ 2 - 1
tools/clang/test/CodeGenHLSL/quick-test/convergent.hlsl

@@ -3,7 +3,8 @@
 // Make sure add is not sink into if.
 // CHECK: fadd
 // CHECK: fadd
-// CHECK: if.then
+// CHECK: fcmp
+// CHECK-NEXT: br
 
 Texture2D<float4> tex;
 SamplerState s;

+ 1 - 1
utils/appveyor/appveyor_test.ps1

@@ -39,7 +39,7 @@ function Invoke-AppveyorTestsRestMethod($appveyorTests) {
 }
 
 function Invoke-TE($logfile) {
-    $testdll = "$env:HLSL_BLD_DIR\Debug\bin\clang-hlsl-tests.dll"
+    $testdll = "$env:HLSL_BLD_DIR\Release\bin\clang-hlsl-tests.dll"
     $p = Start-Process "te.exe" -Args "$testdll /logOutput:Low /logFile:$logfile /enableWttLogging /p:HlslDataDir=%HLSL_SRC_DIR%\tools\clang\test\HLSL /labMode /miniDumpOnCrash" -Wait -NoNewWindow -PassThru
     return $p.ExitCode
 }