diff options
author | Jose Fonseca <jfonseca@vmware.com> | 2015-03-06 12:07:31 +0000 |
---|---|---|
committer | Jose Fonseca <jfonseca@vmware.com> | 2015-03-08 10:05:55 +0000 |
commit | afa9c8b610b1c0ae3e292eb5b2f56695dd5d9357 (patch) | |
tree | a2bd9e81365f681d4a9f0fba7299f2806724f589 | |
parent | f203371f2f01d897b1e81e68ea2e474b547ec3c5 (diff) |
framework: Try to fix the exclusions of llvmpipe test list.
The
del profile.test_list[key]
statement was silently failing because the TestDict's key lowering magic
was not happening for deleted items.
Unfortunately this still is not enough to fix the glean exclusions:
somehow all glean test names are being munged with extra whitespace.
For example:
$ ./piglit-print-commands.py tests/llvmpipe.py | grep '^glean/p'
warning: test glean/pointAtten does not exist
warning: test glean/texCombine does not exist
[...]
glean/p o i n t a t t e n ::: bin/glean -o -v -v -v -t +pointAtten --quick
Reviewed-by: Dylan Baker <baker.dylan.c@gmail.com>
-rw-r--r-- | framework/profile.py | 4 | ||||
-rw-r--r-- | tests/llvmpipe.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/framework/profile.py b/framework/profile.py index e8e8ba18f..409b87e64 100644 --- a/framework/profile.py +++ b/framework/profile.py @@ -80,6 +80,10 @@ class TestDict(dict): # pylint: disable=too-few-public-methods """Lower the value before returning.""" return super(TestDict, self).__getitem__(key.lower()) + def __delitem__(self, key): + """Lower the value before returning.""" + return super(TestDict, self).__delitem__(key.lower()) + class TestProfile(object): """ Class that holds a list of tests for execution diff --git a/tests/llvmpipe.py b/tests/llvmpipe.py index 64c651d5c..beb4511fd 100644 --- a/tests/llvmpipe.py +++ b/tests/llvmpipe.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import platform +import sys from framework.grouptools import join from tests.gpu import profile @@ -12,7 +13,8 @@ def remove(key): try: del profile.test_list[key] except KeyError: - pass + sys.stderr.write('warning: test %s does not exist\n' % key) + sys.stderr.flush() # These take too long or too much memory |