2
0
Эх сурвалжийг харах

Skip enum and ViewID 6.1 tests on validator 1.0 (#315)

Tex Riddell 8 жил өмнө
parent
commit
27e4938ba0

+ 1 - 1
tools/clang/test/CodeGenHLSL/enum1.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_6_1 -HV 2017 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 -HV 2017 %s | FileCheck %s
 
 
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 1)
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 1)
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 1, i32 2)
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 1, i32 2)

+ 1 - 1
tools/clang/test/CodeGenHLSL/enum4.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_6_1 -HV 2017 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 -HV 2017 %s | FileCheck %s
 
 
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 1)
 // CHECK: call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 1)
 
 

+ 1 - 1
tools/clang/test/CodeGenHLSL/enum5.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_6_1 -HV 2017 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 -HV 2017 %s | FileCheck %s
 
 
 // CHECK: fadd
 // CHECK: fadd
 
 

+ 2 - 0
tools/clang/unittests/HLSL/CompilerTest.cpp

@@ -2478,6 +2478,7 @@ TEST_F(CompilerTest, CodeGenEnum2) {
 }
 }
 
 
 TEST_F(CompilerTest, CodeGenEnum3) {
 TEST_F(CompilerTest, CodeGenEnum3) {
+  if (m_ver.SkipDxil_1_1_Test()) return;
     CodeGenTestCheck(L"..\\CodeGenHLSL\\enum3.hlsl");
     CodeGenTestCheck(L"..\\CodeGenHLSL\\enum3.hlsl");
 }
 }
 
 
@@ -4645,6 +4646,7 @@ TEST_F(CompilerTest, WhenSigMismatchPCFunctionThenFail) {
 }
 }
 
 
 TEST_F(CompilerTest, ViewID) {
 TEST_F(CompilerTest, ViewID) {
+  if (m_ver.SkipDxil_1_1_Test()) return;
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid01.hlsl");
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid01.hlsl");
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid02.hlsl");
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid02.hlsl");
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid03.hlsl");
   CodeGenTestCheck(L"..\\CodeGenHLSL\\viewid\\viewid03.hlsl");