Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: tests/skia_test.cpp

Issue 373383003: ios fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove temp directory hack Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "CrashHandler.h" 8 #include "CrashHandler.h"
9 #include "OverwriteLine.h" 9 #include "OverwriteLine.h"
10 #include "Resources.h" 10 #include "Resources.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 return false; 126 return false;
127 } 127 }
128 if (!FLAGS_gpu && isGPUTest) { 128 if (!FLAGS_gpu && isGPUTest) {
129 return false; 129 return false;
130 } 130 }
131 return true; 131 return true;
132 } 132 }
133 133
134 int tool_main(int argc, char** argv); 134 int tool_main(int argc, char** argv);
135 int tool_main(int argc, char** argv) { 135 int tool_main(int argc, char** argv) {
136 #ifndef SK_BUILD_FOR_IOS
136 SetupCrashHandler(); 137 SetupCrashHandler();
reed1 2014/07/10 18:39:39 Comment why we're skipping this? Perhaps a bug or
caryclark 2014/07/10 21:07:03 Done.
138 #endif
137 SkCommandLineFlags::SetUsage(""); 139 SkCommandLineFlags::SetUsage("");
138 SkCommandLineFlags::Parse(argc, argv); 140 SkCommandLineFlags::Parse(argc, argv);
139 141
140 #if SK_ENABLE_INST_COUNT 142 #if SK_ENABLE_INST_COUNT
141 if (FLAGS_leaks) { 143 if (FLAGS_leaks) {
142 gPrintInstCount = true; 144 gPrintInstCount = true;
143 } 145 }
144 #endif 146 #endif
145 147
146 SkGraphics::Init(); 148 SkGraphics::Init();
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 234
233 SkDebugf("\n"); 235 SkDebugf("\n");
234 return (failCount == 0) ? 0 : 1; 236 return (failCount == 0) ? 0 : 1;
235 } 237 }
236 238
237 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 239 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
238 int main(int argc, char * const argv[]) { 240 int main(int argc, char * const argv[]) {
239 return tool_main(argc, (char**) argv); 241 return tool_main(argc, (char**) argv);
240 } 242 }
241 #endif 243 #endif
OLDNEW
« src/core/SkPoint.cpp ('K') | « tests/JpegTest.cpp ('k') | tools/OverwriteLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698