Add dEQP search paths on Android devices

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -16,6 +16,7 @@
 #include "common/angleutils.h"
 #include "common/debug.h"
 #include "common/Optional.h"
+#include "common/platform.h"
 #include "common/string_utils.h"
 #include "gpu_test_expectations_parser.h"
 #include "system_utils.h"
@@ -23,11 +24,16 @@
 namespace
 {
 
+#if defined(ANGLE_PLATFORM_ANDROID)
+const char *g_CaseListRelativePath =
+    "/../../sdcard/chromium_tests_root/third_party/deqp/src/android/cts/master/";
+#else
 const char *g_CaseListRelativePath = "/../../third_party/deqp/src/android/cts/master/";
+#endif
 
 const char *g_TestExpectationsSearchPaths[] = {
     "/../../src/tests/deqp_support/", "/../../third_party/angle/src/tests/deqp_support/",
-    "/deqp_support/",
+    "/deqp_support/", "/../../sdcard/chromium_tests_root/third_party/angle/src/tests/deqp_support/",
 };
 
 const char *g_CaseListFiles[] = {

src/tests/deqp_support/angle_deqp_libtester_main.cpp

@@ -44,15 +44,15 @@ tcu::TestContext *g_testCtx = nullptr;
 tcu::TestPackageRoot *g_root = nullptr;
 tcu::RandomOrderExecutor *g_executor = nullptr;
 
-const char *g_dEQPDataSearchDirs[] =
-{
+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",
-    "../../../third_party/deqp/src/data"
+    "../../../third_party/deqp/src/data",
+    "../../sdcard/chromium_tests_root/third_party/deqp/src/data",
 };
 
 // TODO(jmadill): upstream to dEQP?
@@ -85,14 +85,14 @@ bool FindDataDir(std::string *dataDir)
 {
     for (auto searchDir : g_dEQPDataSearchDirs)
     {
-        if (deIsDir(searchDir))
+        if (deIsDir((std::string(searchDir) + "/gles2").c_str()))
         {
             *dataDir = searchDir;
             return true;
         }
 
         std::string directory = angle::GetExecutableDirectory() + "/" + searchDir;
-        if (deIsDir(directory.c_str()))
+        if (deIsDir((directory + "/gles2").c_str()))
         {
             *dataDir = directory;
             return true;
@@ -102,6 +102,16 @@ bool FindDataDir(std::string *dataDir)
     return false;
 }
 
+std::string GetLogFileName(std::string deqpDataDir)
+{
+#if (DE_OS == DE_OS_ANDROID)
+    // On Android executable dir is not writable, so use data dir instead
+    return deqpDataDir + "/" + g_cmdLine->getLogFileName();
+#else
+    return g_cmdLine->getLogFileName();
+#endif
+}
+
 bool InitPlatform(int argc, const char *argv[])
 {
     try
@@ -127,7 +137,7 @@ bool InitPlatform(int argc, const char *argv[])
 
         g_cmdLine = new tcu::CommandLine(argc, argv);
         g_archive = new tcu::DirArchive(deqpDataDir.c_str());
-        g_log = new tcu::TestLog(g_cmdLine->getLogFileName(), g_cmdLine->getLogFlags());
+        g_log     = new tcu::TestLog(GetLogFileName(deqpDataDir).c_str(), g_cmdLine->getLogFlags());
         g_testCtx = new tcu::TestContext(*g_platform, *g_archive, *g_log, *g_cmdLine, DE_NULL);
         g_root = new tcu::TestPackageRoot(*g_testCtx, tcu::TestPackageRegistry::getSingleton());
         g_executor = new tcu::RandomOrderExecutor(*g_root, *g_testCtx);