1 files changed, 10 insertions, 22 deletions
diff --git a/gfx/angle/src/tests/deqp_support/angle_deqp_libtester_main.cpp b/gfx/angle/src/tests/deqp_support/angle_deqp_libtester_main.cpp
index 90727f390..f5407d570 100755
--- a/gfx/angle/src/tests/deqp_support/angle_deqp_libtester_main.cpp
+++ b/gfx/angle/src/tests/deqp_support/angle_deqp_libtester_main.cpp
@@ -81,25 +81,20 @@ deBool deIsDir(const char *filename)
 #error TODO(jmadill): support other platforms
 #endif
 
-bool FindDataDir(std::string *dataDirOut)
+bool FindDataDir(std::string *dataDir)
 {
     for (auto searchDir : g_dEQPDataSearchDirs)
     {
         if (deIsDir((std::string(searchDir) + "/gles2").c_str()))
         {
-            *dataDirOut = searchDir;
+            *dataDir = searchDir;
             return true;
         }
 
-        std::stringstream dirStream;
-        dirStream << angle::GetExecutableDirectory() << "/" << searchDir;
-        std::string dataDir = dirStream.str();
-        dirStream << "/gles2";
-        std::string searchPath = dirStream.str();
-
-        if (deIsDir(searchPath.c_str()))
+        std::string directory = angle::GetExecutableDirectory() + "/" + searchDir;
+        if (deIsDir((directory + "/gles2").c_str()))
         {
-            *dataDirOut = dataDir;
+            *dataDir = directory;
             return true;
         }
     }
@@ -117,9 +112,7 @@ std::string GetLogFileName(std::string deqpDataDir)
 #endif
 }
 
-}  // anonymous namespace
-
-ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *argv[])
+bool InitPlatform(int argc, const char *argv[])
 {
     try
     {
@@ -158,10 +151,12 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *a
     return true;
 }
 
+} // anonymous namespace
+
 // Exported to the tester app.
 ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[])
 {
-    if (!deqp_libtester_init_platform(argc, argv))
+    if (!InitPlatform(argc, argv))
     {
         tcu::die("Could not initialize the dEQP platform");
     }
@@ -190,25 +185,18 @@ ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[])
 ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform()
 {
     delete g_executor;
-    g_executor = nullptr;
     delete g_root;
-    g_root = nullptr;
     delete g_testCtx;
-    g_testCtx = nullptr;
     delete g_log;
-    g_log = nullptr;
     delete g_archive;
-    g_archive = nullptr;
     delete g_cmdLine;
-    g_cmdLine = nullptr;
     delete g_platform;
-    g_platform = nullptr;
 }
 
 ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName)
 {
     const char *emptyString = "";
-    if (g_platform == nullptr && !deqp_libtester_init_platform(1, &emptyString))
+    if (g_platform == nullptr && !InitPlatform(1, &emptyString))
     {
         tcu::die("Failed to initialize platform.");
     }