Test Runner: Pass dEQP args to child processes.

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -627,15 +627,6 @@ void HandleCaseName(const char *caseString, int *argc, int argIndex, char **argv
 
     argv[argIndex] = gCaseStringBuffer.data();
 }
-
-void DeleteArg(int *argc, int argIndex, char **argv)
-{
-    (*argc)--;
-    for (int moveIndex = argIndex; moveIndex < *argc; ++moveIndex)
-    {
-        argv[moveIndex] = argv[moveIndex + 1];
-    }
-}
 }  // anonymous namespace
 
 // Called from main() to process command-line arguments.
@@ -647,28 +638,21 @@ void InitTestHarness(int *argc, char **argv)
         if (strncmp(argv[argIndex], kdEQPEGLString, strlen(kdEQPEGLString)) == 0)
         {
             HandleDisplayType(argv[argIndex] + strlen(kdEQPEGLString));
-            DeleteArg(argc, argIndex, argv);
         }
         else if (strncmp(argv[argIndex], kANGLEEGLString, strlen(kANGLEEGLString)) == 0)
         {
             HandleDisplayType(argv[argIndex] + strlen(kANGLEEGLString));
-            DeleteArg(argc, argIndex, argv);
         }
         else if (strncmp(argv[argIndex], gdEQPEGLConfigNameString,
                          strlen(gdEQPEGLConfigNameString)) == 0)
         {
             HandleEGLConfigName(argv[argIndex] + strlen(gdEQPEGLConfigNameString));
-            DeleteArg(argc, argIndex, argv);
         }
         else if (strncmp(argv[argIndex], kdEQPCaseString, strlen(kdEQPCaseString)) == 0)
         {
             HandleCaseName(argv[argIndex] + strlen(kdEQPCaseString), argc, argIndex, argv);
-            argIndex++;
-        }
-        else
-        {
-            argIndex++;
         }
+        argIndex++;
     }
 }
 }  // namespace angle

src/tests/test_utils/runner/TestSuite.cpp

@@ -812,7 +812,7 @@ TestSuite::TestSuite(int *argc, char **argv)
                 alsoRunDisabledTests = true;
             }
 
-            mGoogleTestCommandLineArgs.push_back(argv[argIndex]);
+            mChildProcessArgs.push_back(argv[argIndex]);
         }
         ++argIndex;
     }
@@ -1058,7 +1058,7 @@ bool TestSuite::launchChildTestProcess(const std::vector<TestIdentifier> &testsI
     // TODO(jmadill): Remove this once migrated. http://anglebug.com/3162
     args.push_back("--reuse-displays");
 
-    for (const std::string &arg : mGoogleTestCommandLineArgs)
+    for (const std::string &arg : mChildProcessArgs)
     {
         args.push_back(arg.c_str());
     }

src/tests/test_utils/runner/TestSuite.h

@@ -148,7 +148,7 @@ class TestSuite
     int mMaxProcesses;
     int mTestTimeout;
     int mBatchTimeout;
-    std::vector<std::string> mGoogleTestCommandLineArgs;
+    std::vector<std::string> mChildProcessArgs;
     std::map<TestIdentifier, FileLine> mTestFileLines;
     std::vector<ProcessInfo> mCurrentProcesses;
     std::thread mWatchdogThread;