Fix names of some crashing shader tests.

The names were wrong, so the test expectations weren't applying.

BUG=722345

Change-Id: Ic64abf08e512dbf3c297ee89a74b614cd4590b58
Reviewed-on: https://chromium-review.googlesource.com/508166
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
diff --git a/src/tests/deqp_support/deqp_gles2_test_expectations.txt b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
index 135c66f..b94e05b 100644
--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -74,19 +74,19 @@
 // Failure expectations did not work, so skipping these tests.
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.combined.7 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.vertex.94 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.basic.expression.vertex.78 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.basic_expression.vertex.78 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.vertex.2 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.vertex.33 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.comparison.ops.fragment.11 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar.conversion.fragment.11 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar.conversion.combined.11 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.basic.expression.vertex.98 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar.conversion.combined.48 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.comparison_ops.fragment.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar_conversion.fragment.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.basic_expression.vertex.98 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.48 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.swizzle.vertex.38 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar.conversion.combined.79 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.scalar_conversion.combined.79 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.fragment.32 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.conditionals.combined.32 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.all.features.fragment.29 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.all_features.fragment.29 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES2.functional.shaders.random.trigonometric.fragment.77 = SKIP
 
 
diff --git a/src/tests/deqp_support/deqp_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
index 82485a0..5dba77b 100644
--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -253,19 +253,19 @@
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.vertex.2 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.vertex.33 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.fragment.32 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.comparison.ops.fragment.11 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.basic.expression.vertex.98 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar.conversion.fragment.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.comparison_ops.fragment.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.basic_expression.vertex.98 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar_conversion.fragment.11 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.vertex.94 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar.conversion.combined.79 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar_conversion.combined.79 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.swizzle.vertex.38 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.combined.7 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar.conversion.combined.48 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar_conversion.combined.48 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.texture.vertex.3 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar.conversion.combined.11 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.scalar_conversion.combined.11 = SKIP
 722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.conditionals.combined.32 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.all.features.fragment.29 = SKIP
-722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.basic.expression.vertex.78 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.all_features.fragment.29 = SKIP
+722345 LINUX NVIDIA : dEQP-GLES3.functional.shaders.random.basic_expression.vertex.78 = SKIP
 
 // UBO tests trigger crashes when getting the program info log, skip them until this is fixed.
 1323 LINUX : dEQP-GLES3.functional.ubo.* = SKIP