Commit 3b581823 authored by Eric Anholt's avatar Eric Anholt Committed by Kenneth Graunke

Use the external glsl parser for testing.

parent dacc16ce
......@@ -376,7 +376,7 @@ add_plain_test(texturing, 'depth-tex-compare')
glslparsertest = Group()
def add_glslparsertest(shader, result):
glslparsertest[shader] = PlainExecTest(['glslparsertest', 'tests/glslparsertest/shaders/' + shader, result])
glslparsertest[shader] = PlainExecTest(['../tests/glslparsertest/external-glslparsertest.sh', 'tests/glslparsertest/shaders/' + shader, result])
add_glslparsertest('CorrectBuiltInOveride.frag', 'pass')
add_glslparsertest('CorrectComma.frag', 'pass')
......@@ -566,7 +566,7 @@ add_glslparsertest('while2.frag', 'fail')
add_glslparsertest('TernaryOp.frag', 'fail')
def add_otherglslparsertest(shader, result):
glslparsertest[shader] = PlainExecTest(['glslparsertest', 'tests/glslparsertest/' + shader, result])
glslparsertest[shader] = PlainExecTest(['../tests/glslparsertest/external-glslparsertest.sh', 'tests/glslparsertest/' + shader, result])
add_otherglslparsertest('glsl2/array-01.vert', 'fail')
add_otherglslparsertest('glsl2/array-02.vert', 'fail')
add_otherglslparsertest('glsl2/array-03.vert', 'pass')
......
#!/bin/sh
if echo $1 | grep \\.frag > /dev/null; then
type="f"
else
type="v"
fi
~/src/glsl2/glsl $type $1 > /dev/null
status=$?
if test "x$2" = xpass; then
if test "$status" = "0"; then
echo PIGLIT: {\'result\': \'pass\' }
else
echo PIGLIT: {\'result\': \'fail\' }
fi
else
if test "$status" = "0"; then
echo PIGLIT: {\'result\': \'fail\' }
else
echo PIGLIT: {\'result\': \'pass\' }
fi
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment