From: Marek Olšák <[email protected]>
---
tests/all.tests | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/tests/all.tests b/tests/all.tests
index f8e19d3..34f1705 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -265,21 +265,14 @@ add_plain_test(shaders, 'glsl-fs-raytrace-bug27060')
add_plain_test(shaders, 'glsl-fs-sampler-numbering')
add_plain_test(shaders, 'glsl-fs-shader-stencil-export')
add_plain_test(shaders, 'glsl-fs-sqrt-branch')
-shaders['glsl-fs-texturecube'] = PlainExecTest(['glsl-fs-texturecube',
- '-auto'])
-shaders['glsl-fs-texturecube-bias'] = PlainExecTest(['glsl-fs-texturecube',
- '-auto', '-bias'])
-shaders['glsl-fs-texturecube-2'] = PlainExecTest(['glsl-fs-texturecube-2',
- '-auto'])
-shaders['glsl-fs-texturecube-2-bias'] = PlainExecTest(['glsl-fs-texturecube-2',
- '-auto', '-bias'])
-add_plain_test(shaders, 'glsl-fs-textureenvcolor-statechange')
-shaders['glsl-fs-texture2drect'] = PlainExecTest(['glsl-fs-texture2drect',
- '-auto'])
-shaders['glsl-fs-texture2drect-proj3'] =
PlainExecTest(['glsl-fs-texture2drect',
- '-auto', '-proj3'])
-shaders['glsl-fs-texture2drect-proj4'] =
PlainExecTest(['glsl-fs-texture2drect',
- '-auto', '-proj4'])
+add_concurrent_test(shaders, 'glsl-fs-texturecube')
+shaders['glsl-fs-texturecube-bias'] = concurrent_test('glsl-fs-texturecube
-bias')
+add_concurrent_test(shaders, 'glsl-fs-texturecube-2')
+shaders['glsl-fs-texturecube-2-bias'] = concurrent_test('glsl-fs-texturecube-2
-bias')
+add_concurrent_test(shaders, 'glsl-fs-textureenvcolor-statechange')
+add_concurrent_test(shaders, 'glsl-fs-texture2drect');
+shaders['glsl-fs-texture2drect-proj3'] =
concurrent_test('glsl-fs-texture2drect -proj3')
+shaders['glsl-fs-texture2drect-proj4'] =
concurrent_test('glsl-fs-texture2drect -proj4')
add_plain_test(shaders, 'glsl-fs-user-varying-ff')
add_plain_test(shaders, 'glsl-mat-attribute')
shaders['glsl-max-varyings'] = concurrent_test('glsl-max-varyings')
@@ -351,7 +344,7 @@ for subtest in ('interstage', 'intrastage', 'vs-gs'):
shaders[cmdline] = concurrent_test(cmdline)
def add_vpfpgeneric(group, name):
- group[name] = PlainExecTest(['vpfp-generic', '-auto', testsDir +
'/shaders/generic/' + name + '.vpfp'])
+ group[name] = concurrent_test('vpfp-generic ' + testsDir +
'/shaders/generic/' + name + '.vpfp')
glx = Group()
add_msaa_visual_plain_tests(glx, 'glx-copy-sub-buffer')
--
1.8.3.2
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
