[Piglit] [Patch v2 09/13] quick.tests: Make quick.tests import all.tests

[Jose Fonseca]

No, this experiments shows nothing. All it shows it that GleanTest.globalParams has --quick, but that's not the problem.  The problem is that GleanTest.globalParams is only used when GleanTest.__init__ is called.  As I described, the fix is to ensure GleanTest.globalParams is updated *before* GleanTest.__init__ is called. Which can be easily checked doing this:

What you need to do to verify this is the following:

diff --git a/framework/gleantest.py b/framework/gleantest.py
index 88432e0..46db80b 100644
--- a/framework/gleantest.py
+++ b/framework/gleantest.py
@@ -34,6 +34,7 @@ class GleanTest(ExecTest):
     globalParams = []
 
     def __init__(self, name):
+        print GleanTest.globalParams
         ExecTest.__init__(self, [glean_executable,
                                  "-o", "-v", "-v", "-v", "-t",
                                  "+"+name] + GleanTest.globalParams)
 

Another solution is to run:

  ./piglit-print-commands.py tests/quick.py  |& grep glean


Anyway, not getting any piglit results for another day is really blocking my day-to-day work, so I went ahead and prepared a fix myself.  I just posted the patch, and I'll take the liberty of pushing it very soon unless there is a major concern.


Jose

----- Original Message -----
> I don't see a problem with always using --quick, however, I believe that --
> quick is in effect when loading the quick profile.
> 
> Here is how I verified it:
> cd into the piglit root and run the attached script with python. It should
> print ['--quick']
> 
> 
> On Monday, January 13, 2014 12:59:33 PM Jose Fonseca wrote:
> > Another solution is to hardcode  "--quick" on all glean tests. I mean, does
> > anybody ever really want to test all possible blend state combinations?
> > Seems overkill..
> > 
> > Jose
> > 
> > ----- Original Message -----
> > 
> > > Dylan,
> > > 
> > > All my piglit jobs are timing out after this series. They appear to be
> > > taking forever on
> > > 
> > >   [Mon Jan 13 16:12:54 2014] ::  running :: glean/blendFunc
> > > 
> > > I suspect that with the recent changes, the glean is no longer receiving
> > > the --quick option, which is essential.
> > > 
> > > Probably because with the change below, GleanTest.globalParams ends up
> > > being modified *after* the glean tests were constructed.
> > > 
> > > Could you please confirm that when using quick tests, glean still gets
> > > the
> > > --quick appropriately?
> > > 
> > > We should probably make the code more robust agains this, as I believe
> > > this
> > > happened in the past. E.g, adding a big fat warning before
> > > GleanTest.globalParams statement, and/or make GleanTest work in such way
> > > that it will pick up posterior changes in GleanTest.globalParams.
> > > 
> > > 
> > > Jose
> > > 
> > > ----- Original Message -----
> > > 
> > > > Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
> > > > ---
> > > > 
> > > >  tests/quick.py | 8 ++------
> > > >  1 file changed, 2 insertions(+), 6 deletions(-)
> > > > 
> > > > diff --git a/tests/quick.py b/tests/quick.py
> > > > index 0f8c7f3..939aded 100644
> > > > --- a/tests/quick.py
> > > > +++ b/tests/quick.py
> > > > @@ -1,15 +1,11 @@
> > > > 
> > > >  # -*- coding: utf-8 -*-
> > > > 
> > > > -import os.path
> > > > -
> > > > -global profile
> > > > 
> > > >  from framework.gleantest import GleanTest
> > > > 
> > > > +from tests.all import profile
> > > > 
> > > >  __all__ = ['profile']
> > > > 
> > > > -GleanTest.globalParams += [ "--quick" ]
> > > > -
> > > > -execfile(os.path.dirname(__file__) + '/all.py')
> > > > +GleanTest.globalParams += ["--quick"]
> > > > 
> > > >  # These take too long
> > > >  del profile.tests['shaders']['glsl-fs-inline-explosion']
> > > > 
> > > > --
> > > > 1.8.5.2
> > > > 
> > > > _______________________________________________
> > > > Piglit mailing list
> > > > Piglit at lists.freedesktop.org
> > > > https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/
> > > > mailman/listinfo/piglit&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTj
> > > > WVixC0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=sEsxINixJ1aun5RPlXnqBxCRoMjmfO
> > > > tKQwWgx9LUbG0%3D%0A&s=87fcee13d2e88fcd64325d18682168cef30680c9a38de0238d
> > > > 48a06251b7c68a>
> > > _______________________________________________
> > > Piglit mailing list
> > > Piglit at lists.freedesktop.org
> > > https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/ma
> > > ilman/listinfo/piglit&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTjWVix
> > > C0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=sjngPs%2FPaWdTIz%2BSOXYD8ccRM85oold5
> > > RaGeHxax%2BWQ%3D%0A&s=082e5f2e77109c07602be1affc699b985908f0438a7fad548ff1
> > > 2e2933bf2301
>