Add deqp gles 3.1 tests to the build files

CONTRIBUTORS

@@ -104,6 +104,7 @@ NVIDIA Corporation
  Qingqing Deng
  Kimmo Kinnunen
  Sami Väisänen
+ Martin Radev
 
 Opera Software ASA
  Daniel Bratell

src/tests/BUILD.gn

@@ -262,16 +262,19 @@ if (build_angle_deqp_tests) {
   api_names = [
     "gles2",
     "gles3",
+    "gles31",
     "egl",
   ]
   target_defines = [
     "ANGLE_DEQP_GLES2_TESTS",
     "ANGLE_DEQP_GLES3_TESTS",
+    "ANGLE_DEQP_GLES31_TESTS",
     "ANGLE_DEQP_EGL_TESTS",
   ]
   target_sources = [
     deqp_gypi.deqp_gles2_sources,
     deqp_gypi.deqp_gles3_sources,
+    deqp_gypi.deqp_gles31_sources,
     deqp_gypi.deqp_egl_sources,
   ]
 
@@ -280,6 +283,7 @@ if (build_angle_deqp_tests) {
             0,
             1,
             2,
+            3,
           ]) {
     api_name = api_names[index]
     config_name = "angle_deqp_lib${api_name}_config"

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -31,14 +31,12 @@ const char *g_TestExpectationsSearchPaths[] = {
 };
 
 const char *g_CaseListFiles[] = {
-    "gles2-master.txt", "gles3-master.txt", "egl-master.txt",
+    "gles2-master.txt", "gles3-master.txt", "gles31-master.txt", "egl-master.txt",
 };
 
-const char *g_TestExpectationsFiles[] =
-{
-    "deqp_gles2_test_expectations.txt",
-    "deqp_gles3_test_expectations.txt",
-    "deqp_egl_test_expectations.txt",
+const char *g_TestExpectationsFiles[] = {
+    "deqp_gles2_test_expectations.txt", "deqp_gles3_test_expectations.txt",
+    "deqp_gles31_test_expectations.txt", "deqp_egl_test_expectations.txt",
 };
 
 // During the CaseList initialization we cannot use the GTEST FAIL macro to quit the program because
@@ -238,7 +236,11 @@ class dEQP_GLES3 : public dEQPTest<1>
 {
 };
 
-class dEQP_EGL : public dEQPTest<2>
+class dEQP_GLES31 : public dEQPTest<2>
+{
+};
+
+class dEQP_EGL : public dEQPTest<3>
 {
 };
 
@@ -260,6 +262,10 @@ ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES2);
 ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES3);
 #endif
 
+#ifdef ANGLE_DEQP_GLES31_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES31);
+#endif
+
 #ifdef ANGLE_DEQP_EGL_TESTS
 ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_EGL);
 #endif

src/tests/deqp_support/deqp_gles31_test_expectations.txt

+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file contains a list of defective dEQP conformance tests. The expected
+// format is:
+//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
+//
+// MODIFIERS can be a combination of the below list:
+//  WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
+//  MAVERICKS
+//  NVIDIA AMD INTEL
+//  0xabcd - GPU PCI device ID. Specifying a PCI id requires a vendor.
+//  DEBUG RELEASE
+// TODO(jmadill): Add ANGLE Renderer selection modifiers
+//
+// TEST_NAME can be a specific test name, or have a '*' in the end, which
+// indicates a prefix matching.
+//
+// Examples:
+//  91530 MAC WIN LINUX : context_lost_restored = TIMEOUT
+//  91533 WIN : gl_min_uniforms = FAIL
+//  91531 MAC WIN LINUX : conformance_more_* = SKIP
+//  91532 MAC NVIDIA 0x0640 : tex_image_and_sub_image_2d_with_video = PASS FAIL
+
+1442 DEBUG : dEQP_GLES31.* = FAIL
+1442 RELEASE : dEQP_GLES31.* = FAIL