summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-03-09 12:30:13 -0800
committerEric Anholt <eric@anholt.net>2017-03-09 12:30:13 -0800
commit29284a9d4db2707d82296768f4693a5fcbd15249 (patch)
tree9e221f4428187e5698c336ba0dbffe7c87021958
parent3e406c6dc4c9b1b836a866b8e71cf29a19074361 (diff)
driver_classifier: Switch VC4's naming to what I used in trace-db
When I published trace-db, I decided to rename vc4 to mention "v3d", but failed to catch the driver classifier up.
-rw-r--r--framework/driver_classifier.py4
-rw-r--r--unittests/framework/test_driver_classifier.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/driver_classifier.py b/framework/driver_classifier.py
index dcef6cdbc..51137ffd5 100644
--- a/framework/driver_classifier.py
+++ b/framework/driver_classifier.py
@@ -84,8 +84,8 @@ class DriverClassifier(object):
self.categories.append('vc4')
m = re.match(' V3D ([0-9])+\.([0-9])+', m.group(1))
if m is not None:
- self.categories.append('vc4-{}.{}'.format(m.group(1),
- m.group(2)))
+ self.categories.append('vc4-v3d-{}.{}'.format(m.group(1),
+ m.group(2)))
m = re.match('Mesa DRI R200 ', self.renderer)
if m is not None:
diff --git a/unittests/framework/test_driver_classifier.py b/unittests/framework/test_driver_classifier.py
index 4c208421f..114af7e88 100644
--- a/unittests/framework/test_driver_classifier.py
+++ b/unittests/framework/test_driver_classifier.py
@@ -62,7 +62,7 @@ class TestDriverClassifier(object):
# Old VC4 string
('Gallium 0.4 on VC4', ['vc4', 'mesa']),
# Modern VC4 string
- ('Gallium 0.4 on VC4 V3D 2.1', ['vc4-2.1', 'vc4', 'mesa']),
+ ('Gallium 0.4 on VC4 V3D 2.1', ['vc4-v3d-2.1', 'vc4', 'mesa']),
],
ids=six.text_type)
def test_renderer_categorization(self, renderer, categories):