| Index: tests/PathOpsSkpClipTest.cpp
|
| diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
|
| index c96e5bf66cd064d0e35d9bf1589858d9b7e79edb..3c958f1bece4937c57f3c58d37dbca5f43cfeb7b 100644
|
| --- a/tests/PathOpsSkpClipTest.cpp
|
| +++ b/tests/PathOpsSkpClipTest.cpp
|
| @@ -19,7 +19,6 @@
|
| #include "SkOSFile.h"
|
| #include "SkPathOpsDebug.h"
|
| #include "SkPicture.h"
|
| -#include "SkRTConf.h"
|
| #include "SkTSort.h"
|
| #include "SkStream.h"
|
| #include "SkString.h"
|
| @@ -27,6 +26,7 @@
|
| #include "SkTDArray.h"
|
| #include "SkTaskGroup.h"
|
| #include "SkTemplates.h"
|
| +#include "SkTSearch.h"
|
| #include "SkTime.h"
|
|
|
| #include <stdlib.h>
|
| @@ -740,13 +740,6 @@ 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()) {
|
| @@ -827,7 +820,6 @@ typedef SkTRegistry<Test*(*)(void*)> TestRegistry;
|
|
|
| DEF_TEST(PathOpsSkpClip) {
|
| gDirs.setDefault();
|
| - initTest();
|
| SkTArray<TestResult, true> errors;
|
| TestState state;
|
| state.init(0);
|
| @@ -851,7 +843,6 @@ static void testSkpClipMain(TestState* data) {
|
|
|
| DEF_TEST(PathOpsSkpClipThreaded) {
|
| gDirs.setDefault();
|
| - initTest();
|
| TestRunner testRunner;
|
| int dirNo;
|
| gDirs.reset();
|
| @@ -890,7 +881,6 @@ 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]);
|
| @@ -973,7 +963,6 @@ DEF_TEST(PathOpsSkpClipOneOff) {
|
| if (!skp) {
|
| skp = skipOver[testIndex].filename;
|
| }
|
| - initTest();
|
| SkAssertResult(get_in_path(dirNo, skp).size());
|
| SkString filename(skp);
|
| TestResult state;
|
| @@ -993,7 +982,6 @@ DEF_TEST(PathOpsTestSkipped) {
|
| }
|
| int dirNo = skip.directory;
|
| const char* skp = skip.filename;
|
| - initTest();
|
| SkAssertResult(get_in_path(dirNo, skp).size());
|
| SkString filename(skp);
|
| TestResult state;
|
|
|