Fix ParseConfigs_OutParam tests

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 "Test.h"
 #include <initializer_list>
@@ skipping 93 matching lines @@
     REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getSamples() == 16);
     REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[15]->asConfigGpu()->getSamples() == 4);
     REPORTER_ASSERT(reporter, configs[15]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, configs[15]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[19]->asConfigGpu());
-    REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu());
-    REPORTER_ASSERT(reporter, !configs[25]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[24]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType()
+                    == kRGBA_F16_SkColorType);
+    REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getProfileType()
+                    == kLinear_SkColorProfileType);
     REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType()
-                    == kRGBA_F16_SkColorType);
+                    == kN32_SkColorType);
     REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getProfileType()
-                    == kLinear_SkColorProfileType);
-    REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getColorType()
-                    == kN32_SkColorType);
-    REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getProfileType()
                     == kSRGB_SkColorProfileType);
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
+    REPORTER_ASSERT(reporter, configs[20]->asConfigGpu());
+#else
+    REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu());
+#endif
     REPORTER_ASSERT(reporter, configs[21]->asConfigGpu());
 #else
+    REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu());
 #endif
+#if SK_COMMAND_BUFFER
     REPORTER_ASSERT(reporter, configs[22]->asConfigGpu());
 #else
-    REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu());
 #endif
-#if SK_COMMAND_BUFFER
+#if SK_MESA
     REPORTER_ASSERT(reporter, configs[23]->asConfigGpu());
 #else
     REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
 #endif
-#if SK_MESA
-    REPORTER_ASSERT(reporter, configs[24]->asConfigGpu());
-#else
-    REPORTER_ASSERT(reporter, !configs[24]->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)",
@@ skipping 172 matching lines @@
             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
 }