Avoid > in FileCheck run line. (#4768)

Things like -DResType=RasterizerOrderedStructuredBuffer<uint> could be workaround with
-DResType="RasterizerOrderedStructuredBuffer<uint>" for lit.
But clang-hlsl-tests will not work.
So put the template inside the test.

tools/clang/test/HLSLFileCheck/hlsl/objects/RasterizerOrderedBuffer/rovtype.hlsl

@@ -1,10 +1,10 @@
-// RUN: %dxc -DResType=RasterizerOrderedTexture1D<uint> -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedTexture2D<uint> -DPosType=uint2 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedTexture3D<uint> -DPosType=uint3 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedTexture1DArray<uint> -DPosType=uint2 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedTexture2DArray<uint> -DPosType=uint3 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedBuffer<uint> -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=BUFCHK,CHECK
-// RUN: %dxc -DResType=RasterizerOrderedStructuredBuffer<uint> -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=BUFCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedTexture1D -DEltType=uint -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedTexture2D -DEltType=uint -DPosType=uint2 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedTexture3D -DEltType=uint -DPosType=uint3 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedTexture1DArray -DEltType=uint -DPosType=uint2 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedTexture2DArray -DEltType=uint -DPosType=uint3 -T ps_6_0 %s | FileCheck %s -check-prefixes=TXTCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedBuffer -DEltType=uint -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=BUFCHK,CHECK
+// RUN: %dxc -DObjType=RasterizerOrderedStructuredBuffer -DEltType=uint -DPosType=uint1 -T ps_6_0 %s | FileCheck %s -check-prefixes=BUFCHK,CHECK
 
 // BABs can't be indexed so they require special casing
 // RUN: %dxc -DBAB -DResType=RasterizerOrderedByteAddressBuffer -DPosType=uint -T ps_6_0 %s | FileCheck %s -check-prefixes=BUFCHK,CHECK
@@ -12,6 +12,10 @@
 // Verify that the ROV texture type is correctly identified
 // such that a struct member of that type can be assigned
 
+#ifndef BAB
+typedef ObjType<EltType> ResType;
+#endif
+
 ResType GlobalResource[6] : register(u0);
 
 // Use a few different storage and declaration ways

tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/global/global-var-write-test03.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -T ps_6_0 -E PSMain /Gec -HV 2016 > %s | FileCheck %s
+// RUN: %dxc -T ps_6_0 -E PSMain /Gec -HV 2016 %s | FileCheck %s
 
 // CHECK: define void @PSMain()
 // CHECK: call %dx.types.CBufRet.f32 @dx.op.cbufferLoadLegacy.f32(i32 59, %dx.types.Handle %"$Globals_cbuffer", i32 0)