From ecbd056b75cdd765428d2d4f46850f3b92a24941 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Thu, 10 May 2018 10:22:13 -0600
Subject: [PATCH] Tests: Fix #1372: Don't legalize runtests HLSL tests.

We want these tests to be independent of whether SPIRV-opt is used.
---
 Test/baseResults/compoundsuffix.frag.hlsl | 22 ++++++++++++++++++++--
 Test/runtests                             |  6 +++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Test/baseResults/compoundsuffix.frag.hlsl b/Test/baseResults/compoundsuffix.frag.hlsl
index be527a38..c3d1d97b 100644
--- a/Test/baseResults/compoundsuffix.frag.hlsl
+++ b/Test/baseResults/compoundsuffix.frag.hlsl
@@ -1,7 +1,7 @@
 compoundsuffix.frag.hlsl
 // Module Version 10000
 // Generated by (magic number): 80006
-// Id's are bound by 21
+// Id's are bound by 22
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
@@ -10,18 +10,36 @@ compoundsuffix.frag.hlsl
                               ExecutionMode 4 OriginUpperLeft
                               Source HLSL 500
                               Name 4  "main"
+                              Name 11  "@main(vf4;"
+                              Name 10  "fragColor"
+                              Name 15  "fragColor"
+                              Name 16  "param"
                               Name 20  "fragColor"
                               Decorate 20(fragColor) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
                7:             TypeVector 6(float) 4
+               8:             TypePointer Function 7(fvec4)
+               9:             TypeFunction 2 8(ptr)
               13:    6(float) Constant 1065353216
               14:    7(fvec4) ConstantComposite 13 13 13 13
               19:             TypePointer Output 7(fvec4)
    20(fragColor):     19(ptr) Variable Output
          4(main):           2 Function None 3
                5:             Label
-                              Store 20(fragColor) 14
+   15(fragColor):      8(ptr) Variable Function
+       16(param):      8(ptr) Variable Function
+              17:           2 FunctionCall 11(@main(vf4;) 16(param)
+              18:    7(fvec4) Load 16(param)
+                              Store 15(fragColor) 18
+              21:    7(fvec4) Load 15(fragColor)
+                              Store 20(fragColor) 21
+                              Return
+                              FunctionEnd
+  11(@main(vf4;):           2 Function None 9
+   10(fragColor):      8(ptr) FunctionParameter
+              12:             Label
+                              Store 10(fragColor) 14
                               Return
                               FunctionEnd
diff --git a/Test/runtests b/Test/runtests
index 51e15c0f..a084cb5c 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -77,11 +77,11 @@ fi
 # Testing -S and compound suffixes
 #
 echo Running explicit stage test and compound suffix tests
-$EXE -i -S vert nosuffix > $TARGETDIR/nosuffix.out
+$EXE -Od -i -S vert nosuffix > $TARGETDIR/nosuffix.out
 diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1
-$EXE -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl
+$EXE -Od -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl
 diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1
-$EXE -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl
+$EXE -Od -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl
 diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1
 
 #