Use brackets for explicit GPU config params in tools

tests/TestConfigParsing.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 #include "SkColorSpace.h"
 #include "Test.h"
@@ skipping 188 matching lines @@
     REPORTER_ASSERT(reporter, configs[31]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getSamples() == 4);
 #ifdef SK_VULKAN
     REPORTER_ASSERT(reporter, configs[32]->asConfigGpu());
 #endif
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
-        "gpu(nvpr=true,dit=false)",
-        "gpu(api=angle)",
-        "gpu(api=angle-gl)",
-        "gpu(api=mesa,samples=77)",
-        "gpu(dit=true,api=commandbuffer)",
-        "gpu()",
-        "gpu(api=gles)",
-        "gpu(api=gl)",
-        "gpu(api=vulkan)",
+        "gpu[nvpr=true,dit=false]",
+        "gpu[api=angle]",
+        "gpu[api=angle-gl]",
+        "gpu[api=mesa,samples=77]",
+        "gpu[dit=true,api=commandbuffer]",
+        "gpu[]",
+        "gpu[api=gles]",
+        "gpu[api=gl]",
+        "gpu[api=vulkan]",
     });
 
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == config1.count());
     for (int i = 0; i < config1.count(); ++i) {
         REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));
     }
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getContextType() ==
@@ skipping 43 matching lines @@
                               GrContextFactory::kVulkan_ContextType);
     REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0);
 #endif
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsIncorrect, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
-        "gpu(nvpr=1)", // Number as bool.
-        "gpu(api=gl,)", // Trailing in comma.
-        "gpu(api=angle-glu)", // Unknown api.
-        "gpu(api=,samples=0)", // Empty api.
-        "gpu(samples=true)", // Value true as a number.
-        "gpu(samples=0,samples=0)", // Duplicate option key.
-        "gpu(,samples=0)", // Leading comma.
-        "gpu(samples=54", // Missing closing parenthesis.
+        "gpu[nvpr=1]", // Number as bool.
+        "gpu[api=gl,]", // Trailing in comma.
+        "gpu[api=angle-glu]", // Unknown api.
+        "gpu[api=,samples=0]", // Empty api.
+        "gpu[samples=true]", // Value true as a number.
+        "gpu[samples=0,samples=0]", // Duplicate option key.
+        "gpu[,samples=0]", // Leading comma.
+        "gpu[samples=54", // Missing closing parenthesis.
         ",,",
-        "gpu(", // Missing parenthesis.
+        "gpu[", // Missing bracket.
         "samples=54" // No backend.
-        "gpu(nvpr=true )", // Space.
+        "gpu[nvpr=true ]", // Space.
     });
 
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == config1.count());
     for (int i = 0; i < config1.count(); ++i) {
         REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));
         REPORTER_ASSERT(reporter, configs[i]->getBackend().equals(config1[i]));
 #if SK_SUPPORT_GPU
         REPORTER_ASSERT(reporter, !configs[i]->asConfigGpu());
 #endif
     }
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsSurprises, reporter) {
     // These just list explicitly some properties of the system.
     SkCommandLineFlags::StringArray config1 = make_string_array({
         // Options are not canonized -> two same configs have a different tag.
-        "gpu(nvpr=true,dit=true)", "gpu(dit=true,nvpr=true)",
-        "gpu(api=debug)", "gpu(api=gl)", "gpu(api=gles)", ""
-        "gpu", "gpu()", "gpu(samples=0)", "gpu(api=gles,samples=0)"
+        "gpu[nvpr=true,dit=true]", "gpu[dit=true,nvpr=true]",
+        "gpu[api=debug]", "gpu[api=gl]", "gpu[api=gles]", ""
+        "gpu", "gpu[]", "gpu[samples=0]", "gpu[api=gles,samples=0]"
     });
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == config1.count());
     for (int i = 0; i < config1.count(); ++i) {
         REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));
 #if SK_SUPPORT_GPU
         REPORTER_ASSERT(reporter, configs[i]->getBackend().equals("gpu"));
         REPORTER_ASSERT(reporter, configs[i]->asConfigGpu());
 #else
@@ skipping 32 matching lines @@
                 break;
             }
             REPORTER_ASSERT(reporter,
                             configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
         }
     }
 }
 
 DEF_TEST(ParseConfigs_ViaParsingExtendedForm, reporter) {
     SkCommandLineFlags::StringArray config1 = make_string_array({
-        "zz-qq-gpu(api=gles)",
-        "a-gpu(samples=1",
-        "abc-def-angle-gl(samples=1)",
+        "zz-qq-gpu[api=gles]",
+        "a-gpu[samples=1",
+        "abc-def-angle-gl[samples=1]",
     });
 
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     const struct {
         const char* backend;
         const char* vias[3];
     } expectedConfigs[] = {
 #if SK_SUPPORT_GPU
         {"gpu", {"zz", "qq", nullptr}},
 #else
-        {"gpu(api=gles)", {"zz", "qq", nullptr}},
+        {"gpu[api=gles]", {"zz", "qq", nullptr}},
 #endif
-        {"gpu(samples=1", {"a", nullptr, nullptr}}, // This is not extended form, but via still
+        {"gpu[samples=1", {"a", nullptr, nullptr}}, // This is not extended form, but via still
                                                     // works as expected.
-        {"gl(samples=1)", {"abc", "def", "angle"}}  // This is not extended form.  Also
+        {"gl[samples=1]", {"abc", "def", "angle"}}  // This is not extended form.  Also
                                                     // angle-gl is not a "backend" in this case.
     };
     for (int i = 0; i < config1.count(); ++i) {
         REPORTER_ASSERT(reporter, configs[i]->getTag().equals(config1[i]));
         REPORTER_ASSERT(reporter, configs[i]->getBackend().equals(expectedConfigs[i].backend));
         for (int j = 0; j < static_cast<int>(SK_ARRAY_COUNT(expectedConfigs[i].vias)); ++j) {
             if (!expectedConfigs[i].vias[j]) {
                 REPORTER_ASSERT(reporter, configs[i]->getViaParts().count() ==
                                 static_cast<int>(j));
                 break;
             }
             REPORTER_ASSERT(reporter,
                             configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
         }
     }
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[2]->asConfigGpu());
 #endif
 }