Revert of SkRTConf: reduce functionality to what we use, increase simplicity

tests/PathOpsSkpClipTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 // #include "OverwriteLine.h"
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPathOpsDebug.h"
 #include "SkPicture.h"
+#include "SkRTConf.h"
 #include "SkTSort.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkTaskGroup.h"
 #include "SkTemplates.h"
-#include "SkTSearch.h"
 #include "SkTime.h"
 
 #include <stdlib.h>
 
 /* add local exceptions here */
 /* TODO : add command flag interface */
 const struct SkipOverTest {
     int directory;
     const char* filename;
     bool blamePathOps;
@@ skipping 693 matching lines @@
                 return true;
             }
 #endif
         }
 checkEarlyExit:
         ;
     }
     return true;
 }
 
+static void initTest() {
+#if !defined SK_BUILD_FOR_WIN && !defined SK_BUILD_FOR_MAC
+    SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true);
+    SK_CONF_SET("images.png.suppressDecoderWarnings", true);
+#endif
+}
+
 static void testSkpClipEncode(TestState* data) {
     data->fResult.testOne();
     if (verbose()) {
         SkDebugf("+");
     }
 }
 
 static void encodeFound(TestState& state) {
     if (verbose()) {
         if (state.fPixelWorst.count()) {
@@ skipping 60 matching lines @@
                                                                       \
     protected:                                                        \
         void onGetName(SkString* name) override { name->set(#name); } \
         void onRun() override { test_##name(); }                      \
     };                                                                \
     static TestRegistry gReg_##name##Class(name##Class::Factory);     \
     static void test_##name()
 
 DEF_TEST(PathOpsSkpClip) {
     gDirs.setDefault();
+    initTest();
     SkTArray<TestResult, true> errors;
     TestState state;
     state.init(0);
     int dirNo;
     gDirs.reset();
     while ((dirNo = gDirs.next()) > 0) {
         if (verbose()) {
             SkDebugf("dirNo=%d\n", dirNo);
         }
         state.fResult.fDirNo = dirNo;
         if (!doOneDir(&state, false)) {
             break;
         }
     }
     encodeFound(state);
 }
 
 static void testSkpClipMain(TestState* data) {
         (void) doOneDir(data, true);
 }
 
 DEF_TEST(PathOpsSkpClipThreaded) {
     gDirs.setDefault();
+    initTest();
     TestRunner testRunner;
     int dirNo;
     gDirs.reset();
     while ((dirNo = gDirs.next()) > 0) {
         *testRunner.fRunnables.append() = new TestRunnableDir(&testSkpClipMain, dirNo, &testRunner);
     }
     testRunner.render();
     TestState state;
     state.init(0);
     gDirs.reset();
@@ skipping 18 matching lines @@
             return false;
         }
     }
     return true;
 }
 
 DEF_TEST(PathOpsSkpClipUberThreaded) {
     gDirs.setDefault();
     const int firstDirNo = gDirs.next();
     const int lastDirNo = gDirs.last();
+    initTest();
     int dirCount = lastDirNo - firstDirNo + 1;
     SkAutoTDeleteArray<SkTDArray<TestResult> > tests(new SkTDArray<TestResult>[dirCount]);
     SkAutoTDeleteArray<SkTDArray<SortByName*> > sorted(new SkTDArray<SortByName*>[dirCount]);
     if (!buildTests(tests.get(), sorted.get())) {
         return;
     }
     TestRunner testRunner;
     int dirNo;
     gDirs.reset();
     while ((dirNo = gDirs.next()) > 0) {
@@ skipping 62 matching lines @@
 DEF_TEST(PathOpsSkpClipOneOff) {
     const int testIndex = FLAGS_testIndex;
     int dirNo = gDirs.next();
     if (dirNo < 0) {
         dirNo = skipOver[testIndex].directory;
     }
     const char* skp = gNames.next();
     if (!skp) {
         skp = skipOver[testIndex].filename;
     }
+    initTest();
     SkAssertResult(get_in_path(dirNo, skp).size());
     SkString filename(skp);
     TestResult state;
     state.test(dirNo, filename);
     if (verbose()) {
         SkDebugf("%s", state.status().c_str());
     }
     state.fTestStep = kEncodeFiles;
     state.testOne();
 }
 
 DEF_TEST(PathOpsTestSkipped) {
     for (size_t index = 0; index < skipOverCount; ++index) {
         const SkipOverTest& skip = skipOver[index];
         if (!skip.blamePathOps) {
             continue;
         }
         int dirNo = skip.directory;
         const char* skp = skip.filename;
+        initTest();
         SkAssertResult(get_in_path(dirNo, skp).size());
         SkString filename(skp);
         TestResult state;
         state.test(dirNo, filename);
         if (verbose()) {
             SkDebugf("%s", state.status().c_str());
         }
         state.fTestStep = kEncodeFiles;
         state.testOne();
     }
@@ skipping 85 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif