graphics_dEQP: New Intel cts-6.0_r2 expectations.

BUG=chrome-os-partner:49729
TEST=None.

Change-Id: Ia84a3427c10dfe667611095f481652fd183273c8
Reviewed-on: https://chromium-review.googlesource.com/329190
Reviewed-by: Ilja Friedel <ihf@chromium.org>
Tested-by: Ilja Friedel <ihf@chromium.org>
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.capability.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Fail.bz2
index 4164ebd..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Fail.bz2
Binary files differ
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
index 03035a8..a2e06e8 100644
--- 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
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Unknown.bz2
deleted file mode 100644
index 01423f3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Fail.bz2
index 6731839..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Flaky.bz2
new file mode 100644
index 0000000..a2e06e8
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.Flaky.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES2.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Fail.bz2
index d6f0f4b..a604587 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Fail.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 404a595..2b7ad4c 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.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 9608710..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Unknown.bz2
deleted file mode 100644
index 003aa07..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Fail.bz2
index af276ce..a476656 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Flaky.bz2
index fd23129..bd83b4e 100644
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.Flaky.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Fail.bz2
deleted file mode 100644
index 7d27b71..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Fail.bz2
+++ /dev/null
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
deleted file mode 100644
index c652c94..0000000
--- a/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.performance.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.stress.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/baytrail/dEQP-GLES3.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.capability.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.Fail.bz2
index eb3f0b0..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.Fail.bz2
index 6731839..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.InternalError.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.InternalError.bz2
new file mode 100644
index 0000000..9102bc6
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.performance.InternalError.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES2.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.Fail.bz2
index afa693d..a604587 100644
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 1ffb4a5..0000000
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.Fail.bz2
index 01da7d9..3913406 100644
--- a/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.NotSupported.bz2
similarity index 100%
rename from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.NotSupported.bz2
rename to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/braswell/dEQP-GLES3.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.capability.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Fail.bz2
index eb3f0b0..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Unknown.bz2
deleted file mode 100644
index 01423f3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Fail.bz2
deleted file mode 100644
index 6731839..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Flaky.bz2
index 543ec7d..0145355 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.Flaky.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES2.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Fail.bz2
index 089f61c..a604587 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Fail.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
deleted file mode 100644
index 3e61247..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 1ffb4a5..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Unknown.bz2
deleted file mode 100644
index 003aa07..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Fail.bz2
index 9dc8398..299e676 100644
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Flaky.bz2
deleted file mode 100644
index 1728493..0000000
--- a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.CompatibilityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.CompatibilityWarning.bz2
new file mode 100644
index 0000000..77a4975
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.CompatibilityWarning.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.Fail.bz2
new file mode 100644
index 0000000..ee9c33b
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/broadwell/dEQP-GLES3.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.capability.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Fail.bz2
index 1b15866..168ad91 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Unknown.bz2
deleted file mode 100644
index 01423f3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.hasty.Fail.bz2
new file mode 100644
index 0000000..d151939
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES2.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Fail.bz2
index 3b969e1..a604587 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Fail.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
deleted file mode 100644
index 8df92ba..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 9608710..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Unknown.bz2
deleted file mode 100644
index 003aa07..0000000
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.Fail.bz2
index af276ce..a476656 100644
--- a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/haswell/dEQP-GLES3.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.capability.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Fail.bz2
index 1b04ec1..168ad91 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Unknown.bz2
deleted file mode 100644
index 01423f3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.hasty.Fail.bz2
new file mode 100644
index 0000000..d151939
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.functional.hasty.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
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
new file mode 100644
index 0000000..56655bd
--- /dev/null
+++ 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-GLES2.performance.InternalError.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.InternalError.bz2
new file mode 100644
index 0000000..e75b7ee
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.performance.InternalError.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES2.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Fail.bz2
index 49c4327..a604587 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 9608710..0000000
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Unknown.bz2
deleted file mode 100644
index 003aa07..0000000
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.Fail.bz2
index af276ce..a476656 100644
--- a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.NotSupported.bz2
new file mode 100644
index 0000000..00933ca
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.functional.hasty.NotSupported.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
new file mode 100644
index 0000000..e48f9a5
--- /dev/null
+++ 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.performance.InternalError.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.InternalError.bz2
new file mode 100644
index 0000000..07fe57b
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.performance.InternalError.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/ivybridge/dEQP-GLES3.stress.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.capability.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.capability.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.capability.NotSupported.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
index a3745b4..ca959af 100644
--- 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
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Flaky.bz2
deleted file mode 100644
index cfdf5a8..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.NotSupported.bz2
copy to 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
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Fail.bz2
index 6731839..66e80d3 100644
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Flaky.bz2
index cfdf5a8..7b4ab6e 100644
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Flaky.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.Flaky.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.functional.hasty.NotSupported.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
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.stress.NotSupported.bz2
similarity index 100%
copy from client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.stress.NotSupported.bz2
copy to client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES2.stress.NotSupported.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 eba8cbb..a604587 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.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Flaky.bz2
deleted file mode 100644
index 1d19b7a..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.NotSupported.bz2
new file mode 100644
index 0000000..069c884
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.NotSupported.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 9608710..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Unknown.bz2
deleted file mode 100644
index 003aa07..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Fail.bz2
index 2e1a18b..e7b7bdc 100644
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Flaky.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Flaky.bz2
deleted file mode 100644
index 981401f..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.Flaky.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.NotSupported.bz2 b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.NotSupported.bz2
new file mode 100644
index 0000000..069c884
--- /dev/null
+++ b/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.functional.hasty.NotSupported.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
deleted file mode 100644
index f3d786a..0000000
--- a/client/site_tests/graphics_dEQP/expectations/sandybridge/dEQP-GLES3.stress.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Fail.bz2
deleted file mode 100644
index b3bfb2b..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.QualityWarning.bz2
deleted file mode 100644
index ad7dcb3..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Unknown.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Unknown.bz2
deleted file mode 100644
index d2d1e98..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.Unknown.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.Fail.bz2
index 66e80d3..07e36f4 100644
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.performance.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.performance.Fail.bz2
deleted file mode 100644
index 0f6f034..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES2.performance.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.Fail.bz2
deleted file mode 100644
index d2e02f7..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.Fail.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.QualityWarning.bz2
deleted file mode 100644
index 1ffb4a5..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.QualityWarning.bz2
+++ /dev/null
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.Fail.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.Fail.bz2
index dbc9170..75e80c1 100644
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.Fail.bz2
+++ b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.Fail.bz2
Binary files differ
diff --git a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.QualityWarning.bz2 b/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.QualityWarning.bz2
deleted file mode 100644
index 1ffb4a5..0000000
--- a/client/site_tests/graphics_dEQP/expectations/skylake/dEQP-GLES3.functional.hasty.QualityWarning.bz2
+++ /dev/null
Binary files differ