dEQP: Extend GoogleTest support.

build/common.gypi

@@ -6,7 +6,7 @@
     'includes': [ 'common_defines.gypi', ],
     'variables':
     {
-        'angle_path%': '<(DEPTH)',
+        'angle_path': '<(DEPTH)',
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
         'angle_build_winrt_app_type_revision%': '8.1',

src/common/debug.h

@@ -63,6 +63,8 @@ bool DebugAnnotationsActive();
 #define ANGLE_TRACE_ENABLED
 #endif
 
+#define ANGLE_EMPTY_STATEMENT for (;;) break
+
 // A macro to output a trace of a function call and its arguments to the debugging log
 #if defined(ANGLE_TRACE_ENABLED)
 #define TRACE(message, ...) gl::trace(true, gl::MESSAGE_TRACE, "trace: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
@@ -101,11 +103,11 @@ bool DebugAnnotationsActive();
 
 // A macro asserting a condition and outputting failures to the debug log
 #if !defined(NDEBUG)
-#define ASSERT(expression) do { \
+#define ASSERT(expression) { \
     if(!(expression)) \
         ERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \
         assert(expression); \
-    } while(0)
+    } ANGLE_EMPTY_STATEMENT
 #define UNUSED_ASSERTION_VARIABLE(variable)
 #else
 #define ASSERT(expression) (void(0))
@@ -131,20 +133,20 @@ bool DebugAnnotationsActive();
 #endif
 
 #if !defined(NDEBUG)
-#define UNIMPLEMENTED() do { \
+#define UNIMPLEMENTED() { \
     FIXME("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); \
     assert(NOASSERT_UNIMPLEMENTED); \
-    } while(0)
+    } ANGLE_EMPTY_STATEMENT
 #else
     #define UNIMPLEMENTED() FIXME("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__)
 #endif
 
 // A macro for code which is not expected to be reached under valid assumptions
 #if !defined(NDEBUG)
-#define UNREACHABLE() do { \
+#define UNREACHABLE() { \
     ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \
     assert(false); \
-    } while(0)
+    } ANGLE_EMPTY_STATEMENT
 #else
     #define UNREACHABLE() ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__)
 #endif

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -7,17 +7,16 @@
 //   dEQP and GoogleTest integration logic. Calls through to the random
 //   order executor.
 
-#include <gtest/gtest.h>
 #include <stdint.h>
 #include <zlib.h>
 
-#include <algorithm>
-#include <fstream>
+#include <gtest/gtest.h>
 
 #include "angle_deqp_libtester.h"
 #include "common/angleutils.h"
 #include "common/debug.h"
 #include "gpu_test_expectations_parser.h"
+#include "system_utils.h"
 
 namespace
 {
@@ -25,7 +24,7 @@ namespace
 class dEQPCaseList
 {
   public:
-    dEQPCaseList(const char *caseListPath, const char *testExpectationsPath);
+    dEQPCaseList(const std::string &caseListPath, const std::string &testExpectationsPath);
 
     struct CaseInfo
     {
@@ -73,8 +72,10 @@ dEQPCaseList *dEQPCaseList::GetInstance()
 {
     if (mInstance == nullptr)
     {
-        mInstance = new dEQPCaseList("deqp_support/dEQP-GLES2-cases.txt.gz",
-                                     "deqp_support/deqp_test_expectations.txt");
+        std::string exeDir = angle::GetExecutableDirectory();
+        std::string caseListPath = exeDir + "/deqp_support/dEQP-GLES2-cases.txt.gz";
+        std::string testExpectationsPath = exeDir + "/deqp_support/deqp_test_expectations.txt";
+        mInstance = new dEQPCaseList(caseListPath, testExpectationsPath);
     }
     return mInstance;
 }
@@ -86,9 +87,9 @@ void dEQPCaseList::FreeInstance()
     SafeDelete(mInstance);
 }
 
-dEQPCaseList::dEQPCaseList(const char *caseListPath, const char *testExpectationsPath)
+dEQPCaseList::dEQPCaseList(const std::string &caseListPath, const std::string &testExpectationsPath)
 {
-    if (!mTestExpectationsParser.LoadTestExpectationsFromFile(std::string(testExpectationsPath)))
+    if (!mTestExpectationsParser.LoadTestExpectationsFromFile(testExpectationsPath))
     {
         std::cerr << "Failed to load test expectations." << std::endl;
         for (const auto &message : mTestExpectationsParser.GetErrorMessages())
@@ -107,7 +108,7 @@ dEQPCaseList::dEQPCaseList(const char *caseListPath, const char *testExpectation
     std::stringstream caseListStream;
 
     std::vector<char> buf(1024 * 1024 * 16);
-    gzFile *fi = static_cast<gzFile *>(gzopen(caseListPath, "rb"));
+    gzFile *fi = static_cast<gzFile *>(gzopen(caseListPath.c_str(), "rb"));
 
     if (fi == nullptr)
     {

src/tests/deqp_support/angle_deqp_gtest_main.cpp

@@ -12,7 +12,6 @@
 
 int main(int argc, char **argv)
 {
-    deqp_libtester_init_platform(argc, argv, ANGLE_DEQP_DIR "/data");
     testing::InitGoogleTest(&argc, argv);
     int rt = RUN_ALL_TESTS();
     deqp_libtester_shutdown_platform();

src/tests/deqp_support/angle_deqp_libtester.h

@@ -28,7 +28,6 @@
 
 // Exported to the tester app.
 ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[]);
-ANGLE_LIBTESTER_EXPORT void deqp_libtester_init_platform(int argc, char **argv, const char *deqpDataDir);
 ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform();
 ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName);
 

src/tests/deqp_support/angle_deqp_libtester_main.cpp

@@ -9,6 +9,7 @@
 #include <iostream>
 
 #include "angle_deqp_libtester.h"
+#include "common/angleutils.h"
 #include "deMath.h"
 #include "deUniquePtr.hpp"
 #include "tcuApp.hpp"
@@ -19,6 +20,10 @@
 #include "tcuResource.hpp"
 #include "tcuTestLog.hpp"
 
+#if (DE_OS == DE_OS_WIN32)
+#include <Windows.h>
+#endif
+
 // Located in tcuMain.cc in dEQP's sources.
 int main(int argc, const char* argv[]);
 tcu::Platform *createPlatform();
@@ -34,15 +39,48 @@ tcu::TestContext *g_testCtx = nullptr;
 tcu::TestPackageRoot *g_root = nullptr;
 tcu::RandomOrderExecutor *g_executor = nullptr;
 
+const char *g_dEQPDataSearchDirs[] =
+{
+    "data",
+    "third_party/deqp/data",
+    "../third_party/deqp/src/data",
+    "deqp_support/data",
+    "third_party/deqp/src/data",
+    "../../third_party/deqp/src/data"
+};
+
+// TODO(jmadill): upstream to dEQP?
+#if (DE_OS == DE_OS_WIN32)
+deBool deIsDir(const char *filename)
+{
+    DWORD attribs = GetFileAttributesA(filename);
+    return (attribs != INVALID_FILE_ATTRIBUTES) &&
+           ((attribs & FILE_ATTRIBUTE_DIRECTORY) > 0);
 }
+#else
+#error TODO(jmadill): support other platforms
+//deBool deIsDir(const char *filename)
+//{
+//    struct stat st;
+//    int result = stat(filename, &st);
+//    return result == 0 && ((st.st_mode & S_IFDIR) == S_IFDIR);
+//}
+#endif
 
-// Exported to the tester app.
-ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[])
+const char *FindDataDir()
 {
-    return main(argc, argv);
+    for (size_t dirIndex = 0; dirIndex < ArraySize(g_dEQPDataSearchDirs); ++dirIndex)
+    {
+        if (deIsDir(g_dEQPDataSearchDirs[dirIndex]))
+        {
+            return g_dEQPDataSearchDirs[dirIndex];
+        }
+    }
+
+    return nullptr;
 }
 
-ANGLE_LIBTESTER_EXPORT void deqp_libtester_init_platform(int argc, char **argv, const char *deqpDataDir)
+bool InitPlatform()
 {
     try
     {
@@ -54,11 +92,21 @@ ANGLE_LIBTESTER_EXPORT void deqp_libtester_init_platform(int argc, char **argv,
 
         if (!deSetRoundingMode(DE_ROUNDINGMODE_TO_NEAREST))
         {
-            throw std::runtime_error("Failed to set floating point rounding mode.");
+            std::cout << "Failed to set floating point rounding mode." << std::endl;
+            return false;
+        }
+
+        const char *deqpDataDir = FindDataDir();
+
+        if (deqpDataDir == nullptr)
+        {
+            std::cout << "Failed to find dEQP data directory." << std::endl;
+            return false;
         }
 
         // TODO(jmadill): filter arguments
-        g_cmdLine = new tcu::CommandLine(1, argv);
+        const char *emptyString = "";
+        g_cmdLine = new tcu::CommandLine(1, &emptyString);
         g_archive = new tcu::DirArchive(deqpDataDir);
         g_log = new tcu::TestLog(g_cmdLine->getLogFileName(), g_cmdLine->getLogFlags());
         g_testCtx = new tcu::TestContext(*g_platform, *g_archive, *g_log, *g_cmdLine, DE_NULL);
@@ -68,7 +116,18 @@ ANGLE_LIBTESTER_EXPORT void deqp_libtester_init_platform(int argc, char **argv,
     catch (const std::exception& e)
     {
         tcu::die("%s", e.what());
+        return false;
     }
+
+    return true;
+}
+
+} // anonymous namespace
+
+// Exported to the tester app.
+ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[])
+{
+    return main(argc, argv);
 }
 
 ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform()
@@ -84,9 +143,9 @@ ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform()
 
 ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName)
 {
-    if (!g_platform)
+    if (g_platform == nullptr && !InitPlatform())
     {
-        return false;
+        tcu::die("Failed to initialize platform.");
     }
 
     try

src/tests/third_party/gpu_test_expectations/angle-mods.patch

-diff --git a/angle_config.h b/angle_config.h
+diff --git a/src/tests/third_party/gpu_test_expectations/angle_config.h b/src/tests/third_party/gpu_test_expectations/angle_config.h
 new file mode 100644
-index 0000000..0d43371
+index 0000000..7643346
 --- /dev/null
-+++ b/angle_config.h
++++ b/src/tests/third_party/gpu_test_expectations/angle_config.h
 @@ -0,0 +1,39 @@
 +//
 +// Copyright 2015 The ANGLE Project Authors. All rights reserved.
@@ -25,7 +25,7 @@ index 0000000..0d43371
 +
 +#define DCHECK_EQ(A,B) ASSERT((A) == (B))
 +#define DCHECK_NE(A,B) ASSERT((A) != (B))
-+#define DCHECK ASSERT
++#define DCHECK(X) ASSERT(X)
 +#define LOG(X) std::cerr
 +#define StringPrintf FormatString
 +
@@ -43,10 +43,10 @@ index 0000000..0d43371
 +#define OS_WIN
 +
 +#endif
-diff --git a/gpu_info.cc b/gpu_info.cc
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_info.cc b/src/tests/third_party/gpu_test_expectations/gpu_info.cc
 index 85d26fb..c8e2988 100644
---- a/gpu_info.cc
-+++ b/gpu_info.cc
+--- a/src/tests/third_party/gpu_test_expectations/gpu_info.cc
++++ b/src/tests/third_party/gpu_test_expectations/gpu_info.cc
 @@ -2,7 +2,7 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -158,10 +158,10 @@ index 85d26fb..c8e2988 100644
    enumerator->EndAuxAttributes();
  }
  
-diff --git a/gpu_info.h b/gpu_info.h
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_info.h b/src/tests/third_party/gpu_test_expectations/gpu_info.h
 index f377698..35e791e 100644
---- a/gpu_info.h
-+++ b/gpu_info.h
+--- a/src/tests/third_party/gpu_test_expectations/gpu_info.h
++++ b/src/tests/third_party/gpu_test_expectations/gpu_info.h
 @@ -11,13 +11,7 @@
  #include <string>
  #include <vector>
@@ -252,10 +252,10 @@ index f377698..35e791e 100644
  
      // Markers indicating that a GPUDevice is being described.
      virtual void BeginGPUDevice() = 0;
-diff --git a/gpu_test_config.cc b/gpu_test_config.cc
-index c062c4d..d2c6b5a 100644
---- a/gpu_test_config.cc
-+++ b/gpu_test_config.cc
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc b/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
+index c062c4d..d9b0da2 100644
+--- a/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
++++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
 @@ -2,24 +2,73 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -320,10 +320,10 @@ index c062c4d..d2c6b5a 100644
 +  *device_id = 0;
 +
 +  // Taken from http://developer.nvidia.com/object/device_ids.html
-+  DISPLAY_DEVICE dd;
-+  dd.cb = sizeof(DISPLAY_DEVICE);
++  DISPLAY_DEVICEA dd;
++  dd.cb = sizeof(DISPLAY_DEVICEA);
 +  std::string id;
-+  for (int i = 0; EnumDisplayDevices(NULL, i, &dd, 0); ++i) {
++  for (int i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) {
 +    if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) {
 +      id = dd.DeviceID;
 +      break;
@@ -363,10 +363,10 @@ index c062c4d..d2c6b5a 100644
 -
  }  // namespace gpu
  
-diff --git a/gpu_test_config.h b/gpu_test_config.h
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config.h b/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
 index 8b184d3..e628886 100644
---- a/gpu_test_config.h
-+++ b/gpu_test_config.h
+--- a/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
++++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
 @@ -8,9 +8,7 @@
  #include <string>
  #include <vector>
@@ -388,10 +388,10 @@ index 8b184d3..e628886 100644
  };
  
  }  // namespace gpu
-diff --git a/gpu_test_expectations_parser.cc b/gpu_test_expectations_parser.cc
-index 8b3584a..092cf9b 100644
---- a/gpu_test_expectations_parser.cc
-+++ b/gpu_test_expectations_parser.cc
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
+index 8b3584a..d6ba5c3 100644
+--- a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
++++ b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
 @@ -2,14 +2,35 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -435,6 +435,21 @@ index 8b3584a..092cf9b 100644
  
  namespace gpu {
  
+@@ -161,10 +182,10 @@ bool NamesMatching(const std::string& ref, const std::string& test_name) {
+ 
+ GPUTestExpectationsParser::GPUTestExpectationsParser() {
+   // Some sanity check.
+-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfExactMatchTokens),
+-            sizeof(kTokenData) / sizeof(kTokenData[0]));
+-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfErrors),
+-            sizeof(kErrorMessage) / sizeof(kErrorMessage[0]));
++  static_assert(static_cast<unsigned int>(kNumberOfExactMatchTokens) ==
++                sizeof(kTokenData) / sizeof(kTokenData[0]), "sanity check");
++  static_assert(static_cast<unsigned int>(kNumberOfErrors) ==
++                sizeof(kErrorMessage) / sizeof(kErrorMessage[0]), "sanity check");
+ }
+ 
+ GPUTestExpectationsParser::~GPUTestExpectationsParser() {
 @@ -189,8 +210,8 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) {
    return rt;
  }
@@ -446,10 +461,28 @@ index 8b3584a..092cf9b 100644
    entries_.clear();
    error_messages_.clear();
  
-diff --git a/gpu_test_expectations_parser.h b/gpu_test_expectations_parser.h
+@@ -370,7 +391,7 @@ bool GPUTestExpectationsParser::ParseLine(
+           stage++;
+         break;
+       default:
+-        DCHECK(false);
++        UNREACHABLE();
+         break;
+     }
+   }
+@@ -446,7 +467,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
+           config->build_type() | kTokenData[token].flag);
+       break;
+     default:
+-      DCHECK(false);
++      UNREACHABLE();
+       break;
+   }
+   return true;
+diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
 index a69f7e9..a112700 100644
---- a/gpu_test_expectations_parser.h
-+++ b/gpu_test_expectations_parser.h
+--- a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
++++ b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
 @@ -8,10 +8,8 @@
  #include <string>
  #include <vector>

src/tests/third_party/gpu_test_expectations/angle_config.h

@@ -19,7 +19,7 @@
 
 #define DCHECK_EQ(A,B) ASSERT((A) == (B))
 #define DCHECK_NE(A,B) ASSERT((A) != (B))
-#define DCHECK ASSERT
+#define DCHECK(X) ASSERT(X)
 #define LOG(X) std::cerr
 #define StringPrintf FormatString
 

src/tests/third_party/gpu_test_expectations/gpu_test_config.cc

@@ -51,10 +51,10 @@ CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
   *device_id = 0;
 
   // Taken from http://developer.nvidia.com/object/device_ids.html
-  DISPLAY_DEVICE dd;
-  dd.cb = sizeof(DISPLAY_DEVICE);
+  DISPLAY_DEVICEA dd;
+  dd.cb = sizeof(DISPLAY_DEVICEA);
   std::string id;
-  for (int i = 0; EnumDisplayDevices(NULL, i, &dd, 0); ++i) {
+  for (int i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) {
     if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) {
       id = dd.DeviceID;
       break;

src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc

@@ -182,10 +182,10 @@ bool NamesMatching(const std::string& ref, const std::string& test_name) {
 
 GPUTestExpectationsParser::GPUTestExpectationsParser() {
   // Some sanity check.
-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfExactMatchTokens),
-            sizeof(kTokenData) / sizeof(kTokenData[0]));
-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfErrors),
-            sizeof(kErrorMessage) / sizeof(kErrorMessage[0]));
+  static_assert(static_cast<unsigned int>(kNumberOfExactMatchTokens) ==
+                sizeof(kTokenData) / sizeof(kTokenData[0]), "sanity check");
+  static_assert(static_cast<unsigned int>(kNumberOfErrors) ==
+                sizeof(kErrorMessage) / sizeof(kErrorMessage[0]), "sanity check");
 }
 
 GPUTestExpectationsParser::~GPUTestExpectationsParser() {
@@ -391,7 +391,7 @@ bool GPUTestExpectationsParser::ParseLine(
           stage++;
         break;
       default:
-        DCHECK(false);
+        UNREACHABLE();
         break;
     }
   }
@@ -467,7 +467,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
           config->build_type() | kTokenData[token].flag);
       break;
     default:
-      DCHECK(false);
+      UNREACHABLE();
       break;
   }
   return true;