OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 /* | 8 /* |
9 * Code for the "gm" (Golden Master) rendering comparison tool. | 9 * Code for the "gm" (Golden Master) rendering comparison tool. |
10 * | 10 * |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
172 { " cross-process", SkGPipeWriter::kCrossProcess_Flag }, | 172 { " cross-process", SkGPipeWriter::kCrossProcess_Flag }, |
173 { " cross-process, shared address", SkGPipeWriter::kCrossProcess_Flag | 173 { " cross-process, shared address", SkGPipeWriter::kCrossProcess_Flag |
174 | SkGPipeWriter::kSharedAddressSpace_Flag } | 174 | SkGPipeWriter::kSharedAddressSpace_Flag } |
175 }; | 175 }; |
176 | 176 |
177 class GMMain { | 177 class GMMain { |
178 public: | 178 public: |
179 GMMain() : fUseFileHierarchy(false), fMismatchPath(NULL), fTestsRun(0), | 179 GMMain() : fUseFileHierarchy(false), fMismatchPath(NULL), fTestsRun(0), |
180 fRenderModesEncountered(1) { | 180 fRenderModesEncountered(1) { |
181 fIgnorableErrorCombination.add(kMissingExpectations_ErrorType); | 181 fIgnorableErrorCombination.add(kMissingExpectations_ErrorType); |
182 fIgnorableErrorCombination.add(kIntentionallySkipped_ErrorType); | |
epoger
2013/04/09 15:20:40
kIntentionallySkipped_ErrorType is not cause for c
| |
182 } | 183 } |
183 | 184 |
184 SkString make_name(const char shortName[], const char configName[]) { | 185 SkString make_name(const char shortName[], const char configName[]) { |
185 SkString name; | 186 SkString name; |
186 if (0 == strlen(configName)) { | 187 if (0 == strlen(configName)) { |
187 name.append(shortName); | 188 name.append(shortName); |
188 } else if (fUseFileHierarchy) { | 189 } else if (fUseFileHierarchy) { |
189 name.appendf("%s%c%s", configName, SkPATH_SEPARATOR, shortName); | 190 name.appendf("%s%c%s", configName, SkPATH_SEPARATOR, shortName); |
190 } else { | 191 } else { |
191 name.appendf("%s_%s", shortName, configName); | 192 name.appendf("%s_%s", shortName, configName); |
(...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1816 if (FLAGS_forceBWtext) { | 1817 if (FLAGS_forceBWtext) { |
1817 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref(); | 1818 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref(); |
1818 } | 1819 } |
1819 } | 1820 } |
1820 | 1821 |
1821 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 1822 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
1822 int main(int argc, char * const argv[]) { | 1823 int main(int argc, char * const argv[]) { |
1823 return tool_main(argc, (char**) argv); | 1824 return tool_main(argc, (char**) argv); |
1824 } | 1825 } |
1825 #endif | 1826 #endif |
OLD | NEW |