On 09/16/2013 11:08 AM, Marek Olšák wrote: > --- > tests/quick-driver.tests | 14 -------------- > tests/quick.tests | 6 ++++++ > 2 files changed, 6 insertions(+), 14 deletions(-) > delete mode 100644 tests/quick-driver.tests > > diff --git a/tests/quick-driver.tests b/tests/quick-driver.tests > deleted file mode 100644 > index f7c1a0f..0000000 > --- a/tests/quick-driver.tests > +++ /dev/null > @@ -1,14 +0,0 @@ > -# -*- coding: utf-8 -*- > - > -import os.path > - > -global profile > - > -execfile(os.path.dirname(__file__) + '/quick.tests') > - > -# These take too long > -del profile.tests['shaders']['glsl-fs-inline-explosion'] > -del profile.tests['shaders']['glsl-fs-unroll-explosion'] > -del profile.tests['shaders']['glsl-vs-inline-explosion'] > -del profile.tests['shaders']['glsl-vs-unroll-explosion'] > -del profile.tests['spec']['!OpenGL 1.1']['streaming-texture-leak'] > diff --git a/tests/quick.tests b/tests/quick.tests > index 58c5d41..f840da8 100644 > --- a/tests/quick.tests > +++ b/tests/quick.tests > @@ -11,3 +11,9 @@ from framework.gleantest import GleanTest > GleanTest.globalParams += [ "--quick" ] > > execfile(os.path.dirname(__file__) + '/all.tests') > + > +# These take too long > +del profile.tests['shaders']['glsl-fs-inline-explosion'] > +del profile.tests['shaders']['glsl-fs-unroll-explosion'] > +del profile.tests['shaders']['glsl-vs-inline-explosion'] > +del profile.tests['shaders']['glsl-vs-unroll-explosion'] >
This looks good to me! Not including the inline/unroll explosion tests (which always fail, and probably will continue to fail for the forseeable future) in quick.tests makes a lot of sense. I'm glad to see that you kept streaming-texture-leak. It is pretty slow, but it at least passes and has caught bugs in the past. Reviewed-by: Kenneth Graunke <[email protected]> _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
