[Piglit] [PATCH] deqp: (V4)Add option to run subset of external dEQP-GLES3

[Wang, Shuo]

Thank you Dylan, the V5 with subject ([PATCH] deqp: (V5)Add option to run subset of external dEQP-GLES3) is sent out for fixing these issues. 

Thanks,
Shuo

-----Original Message-----
From: Dylan Baker [mailto:baker.dylan.c at gmail.com] 
Sent: Thursday, January 22, 2015 6:37 PM
To: piglit at lists.freedesktop.org
Cc: Wang, Shuo; Jin, Gordon
Subject: Re: [Piglit] [PATCH] deqp: (V4)Add option to run subset of external dEQP-GLES3

Okay, I have a few more comments, once these are fixed I think this'll be ready to land. All of the stuff left is pretty minor.

Your indentation is still wrong, it should be four spaces for each level of indentation using spaces.

here's an example
for x in a_list:
    print(x)
    if x is None:
        break

On Thursday, January 22, 2015 23:54:47 Wang Shuo wrote:
> Google have already added a subset of dEQP into Android CTS test, and 
> we believe this part of dEQP have higher priority than the rest of 
> dEQP test cases.
> the case list is stored at some xml files. Such as:
> com.drawelements.deqp.gles3.xml.
> It's git repo lives in the Android tree at 
> [https://android.googlesource.com/platform/external/ \ 
> deqp/+/lollipop-dev/android/cts/com.drawelements.deqp.gles3.xml]
> 
> This patch is based on Chad's patch(Add test profile for external
> dEQP-GLES3 tests), and add an option to run the subset of dEQP-GLES3.
> The only differnce for the running method is: you need to set the 
> environment variable PIGLIT_DEQP_MUSTPASS or the piglit.conf option 
> deqp-gles3.mustpasslist,then it will run the subset of dEQP follow the 
> test case list. If not set, it will still run the whole dEQP.
> 
> Tested on Intel HSW. There are 45866 test cases for the whole dEQP and 
> 37354 test cases for the subset of dEQP using Android CTS test case 
> list.
> 
> V2:
> 1.Update the link of get test case list file.
> 2.Using xml.etree.cElementTree module instead of re module.
> 3.Fix some Piglit style issue
> 
> V3:
> 1.Update the output issue.
> 2.Fix some Piglit style issue.
> 
> V4:
> 1.Fix some Piglit style issue.
> 
> Signed-off-by: Wang Shuo <shuo.wang at intel.com>
> ---
>  piglit.conf.example |  6 ++++++
>  tests/deqp_gles3.py | 32 ++++++++++++++++++++++++++++++++
>  2 files changed, 38 insertions(+)
> 
> diff --git a/piglit.conf.example b/piglit.conf.example index 
> b3869c2..c30eef4 100644
> --- a/piglit.conf.example
> +++ b/piglit.conf.example
> @@ -44,6 +44,12 @@ testB
>  ; option is not required. The environment variable 
> PIGLIT_DEQP_GLES3_EXTRA_ARGS  ; overrides the value set here.
>  ;extra_args=--deqp-visibility hidden
> +;
> +; Path to the test case list of CTS for deqp-gles3. You can also set 
> +this with ; the environment variable PIGLIT_DEQP_MUSTPASS. Piglit 
> +will run the subset of ; dEQP-GLES3 tests if and only if this option is set.
> +;mustpasslist= \
> +; 
> +/android/platform/external/deqp/android/cts/com.drawelements.deqp.gle
> +s3.xml
>  
>  ; Section for specific oclconform test.  One of these sections is 
> required for  ; each test list in the oclconform section and must be called:
> diff --git a/tests/deqp_gles3.py b/tests/deqp_gles3.py index 
> b1bb33b..af36685 100644
> --- a/tests/deqp_gles3.py
> +++ b/tests/deqp_gles3.py
> @@ -21,6 +21,7 @@
>  import ConfigParser
>  import os
>  import subprocess
> +import xml.etree.cElementTree as ET
>  
>  # Piglit modules
>  import framework
> @@ -28,6 +29,31 @@ from framework.profile import Test, TestProfile
>  
>  __all__ = ['profile']

add an extra newline here

>  
> +def get_test_case(root, root_group, i, outputfile):

'i' isn't actually used, you should removed

> +   """Parser the test case list of Google Android CTS,
> +   and store the test case list to dEQP-GLES3-cases.txt
> +   """
> +   for child in root:
> +    root_group.append(child.get('name'))
> +    if child.tag == "Test":
> +      outputfile.write('TEST: {}\n'.format('.'.join(root_group)))
> +      root_group.pop()

.pop() is for removing the last value and using it, you should use del
instaed:
del root_group[-1]

> +    else:
> +      get_test_case(child, root_group, i + 1, outputfile)

'i' isn't actually used, you should removed

> +      root_group.pop()

del root_group[-1]

> +

add an extra newline here

> +def load_test_hierarchy(input, output):
> +   """Google have added a subset of dEQP to CTS test, the case list is
> +   stored at some xml files. Such as: com.drawelements.deqp.gles3.xml
> +   This function is used to parser the file, and generate 
> +   a new dEQP-GLES3-cases.txt which only contain the subset of dEQP.
> +   """
> +   tree = ET.parse(input)
> +   root = tree.getroot()
> +   root_group = range(0)

You don't actually need a list with 0 in it, you just need an empty
list:
root_group = []

> +   i = 0

i is unused, remove it

> +   get_test_case(root, root_group, i, open(output, 'w'))

remove i

change this to:
with open(output, 'w') as f:
    get_test_case(root, root_group, f)

> +

add an extra newline here

>  def get_option(env_varname, config_option):
>      """Query the given environment variable and then piglit.conf for the
>      option. Return None if the option is unset.
> @@ -50,6 +76,10 @@ def get_option(env_varname, config_option):
>  # Path to the deqp-gles3 executable.
>  DEQP_GLES3_EXE = get_option('PIGLIT_DEQP_GLES3_EXE', ('deqp-gles3', 
> 'exe'))
>  
> +# Path to the xml file which contained the case list of the subset of 
> +dEQP # and marked as must pass in CTS.
> +DEQP_MUSTPASS = get_option('PIGLIT_DEQP_MUSTPASS', ('deqp-gles3', 
> +'mustpasslist'))
> +
>  DEQP_GLES3_EXTRA_ARGS = get_option('PIGLIT_DEQP_GLES3_EXTRA_ARGS',
>                                     ('deqp-gles3', 'extra_args'))
>  
> @@ -72,6 +102,8 @@ def gen_caselist_txt():
>      subprocess.check_call(
>          [DEQP_GLES3_EXE, '--deqp-runmode=txt-caselist'],
>          cwd=basedir)
> +    if DEQP_MUSTPASS is not None:
> +      load_test_hierarchy(DEQP_MUSTPASS, caselist_path)

The indentation here is also off

>      assert os.path.exists(caselist_path)
>      return caselist_path
>  
> --
> 1.8.3.2
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>