Google Git
Sign in
cos / mirrors / cros / chromiumos / third_party / autotest / c044369383adb28e43304e3bcd202bdaab72a7b6^! / .
commitc044369383adb28e43304e3bcd202bdaab72a7b6[log] [tgz]
authorIlja H. Friedel <ihf@chromium.org>Mon May 11 15:22:20 2015 -0700
committerIlja Friedel <ihf@chromium.org>Mon May 11 23:30:32 2015 +0000
tree54206c301dc755bf530c2fad946d41c3b84e7625
parent35296a3fd31335c472909f2788d0c4f07522e8ed [diff]
graphics_dEQP: update expectations.

1) Make a small change to process_logs.py in how failures are parsed.
2) Update expectations based on this change and Flaky wmatrix results.

BUG=chromium:461023
TEST=None.

Change-Id: I6f83b804f8cd540ba6a4fdc20606e3b7f5831566
Reviewed-on: https://chromium-review.googlesource.com/270285
Commit-Queue: Ilja Friedel <ihf@chromium.org>
Trybot-Ready: Ilja Friedel <ihf@chromium.org>
Tested-by: Ilja Friedel <ihf@chromium.org>
Reviewed-by: Haixia Shi <hshi@chromium.org>

diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Flaky.bz2
new file mode 100644
index 0000000..0588fb2
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Flaky.bz2
new file mode 100644
index 0000000..b34c507
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Flaky.bz2
index e3bcfb0..600cade 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.ParseTestResultFail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.ParseTestResultFail.bz2
index 815e63a..a4975f0 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.ParseTestResultFail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.ParseTestResultFail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Flaky.bz2
index 9bfd305..e1d6525 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Flaky.bz2
index 1c6c8e6..2823c31 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Flaky.bz2
index be655a2..303c35b 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Flaky.bz2
index 38fa6f6..569da40 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.performance.Flaky.bz2
new file mode 100644
index 0000000..8c719d5
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Flaky.bz2
index 01ca3a9..f388047 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Flaky.bz2
index 57aea2c..d37e30f 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Flaky.bz2
index dbc611c..7948fb0 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.ParseTestResultFail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.ParseTestResultFail.bz2
index 815e63a..a4975f0 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.ParseTestResultFail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.ParseTestResultFail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.performance.Flaky.bz2
index 1fe37df..9b70455 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.Flaky.bz2
index 37fa62c..6143728 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Flaky.bz2
new file mode 100644
index 0000000..d93ecda
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Flaky.bz2
index e9a4d63..716e861 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Flaky.bz2
index dbc611c..7948fb0 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.ParseTestResultFail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.ParseTestResultFail.bz2
index 815e63a..a4975f0 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.ParseTestResultFail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.ParseTestResultFail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.Flaky.bz2
index 45abea6..4a224e2 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.Flaky.bz2
index 62a2ddd..3f98213 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Fail.bz2
new file mode 100644
index 0000000..4f58266
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Fail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.NotSupported.bz2
new file mode 100644
index 0000000..74f983e
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.QualityWarning.bz2
new file mode 100644
index 0000000..b4b494d
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.QualityWarning.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.TestTimeout.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.TestTimeout.bz2
new file mode 100644
index 0000000..0588fb2
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.TestTimeout.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Timeout.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Timeout.bz2
new file mode 100644
index 0000000..a04f1fd
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Timeout.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.Fail.bz2
new file mode 100644
index 0000000..0f6f034
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.Fail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.TestTimeout.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.TestTimeout.bz2
new file mode 100644
index 0000000..b34c507
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.TestTimeout.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Fail.bz2
index ebfd359..c5620d4 100644
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Fail.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.TestTimeout.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.TestTimeout.bz2
new file mode 100644
index 0000000..298a4ef
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.TestTimeout.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.performance.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.performance.Flaky.bz2
new file mode 100644
index 0000000..8c719d5
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.performance.Flaky.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.stress.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.stress.Unknown.bz2
new file mode 100644
index 0000000..a0c8910
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.stress.Unknown.bz2
Binary files differ

diff --git a/client/site_tests/graphics_dEQP/process_logs.py b/client/site_tests/graphics_dEQP/process_logs.py
index 2189d99..c604140 100644
--- a/client/site_tests/graphics_dEQP/process_logs.py
+++ b/client/site_tests/graphics_dEQP/process_logs.py

@@ -12,8 +12,8 @@
 import subprocess
 
 _EXPECTATIONS_DIR = 'expectations'
-_RESULTID_WILDCARD = '314*'
-_AUTOTEST_RESULT_PATH = 'gs://chromeos-autotest-results/' + _RESULTID_WILDCARD + '-chromeos-test/chromeos*/graphics_dEQP/debug/graphics_dEQP.INFO'
+_RESULTID_WILDCARD = '3209576*'
+_AUTOTEST_RESULT_TEMPLATE = 'gs://chromeos-autotest-results/%s-chromeos-test/chromeos*/graphics_dEQP/debug/graphics_dEQP.INFO'
 
 _BOARD_REGEX = re.compile(r'ChromeOS BOARD = (.+)')
 _CPU_FAMILY_REGEX = re.compile(r'ChromeOS CPU family = (.+)')
@@ -185,7 +185,9 @@
     lines = f.read().splitlines()
   text = ''
   for line in lines:
-    if not '[stderr]' in line:
+    if ('dEQP test filter =' in line or 'ChromeOS BOARD = ' in line or
+        'ChromeOS CPU family =' in line or 'ChromeOS GPU family =' in line or
+        'TestCase: ' in line or 'Result: ' in line):
       text += line + '\n'
   # TODO(ihf): Warn about or reject log files missing the end marker.
   return text
@@ -212,6 +214,10 @@
 # feel free to process them incrementally.
 execute(['rm', '-rf', _EXPECTATIONS_DIR])
 # You can choose to download logs manually or search for them on GS.
-#logs = get_logs_from_gs(_AUTOTEST_RESULT_PATH)
+ids = [_RESULTID_WILDCARD]
+for id in ids:
+  gs_path = _AUTOTEST_RESULT_TEMPLATE % id
+  logs = get_logs_from_gs(gs_path)
+
 logs = get_local_logs()
 process_logs(logs)