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

Side by Side Diff: tests/skia_test.cpp

Issue 14177002: Better fix for the patched build. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « gyp/pathops_unittest.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "../tools/flags/SkCommandLineFlags.h" 8 #include "SkCommandLineFlags.h"
9 #include "SkGraphics.h" 9 #include "SkGraphics.h"
10 #include "Test.h" 10 #include "Test.h"
11 #include "SkOSFile.h" 11 #include "SkOSFile.h"
12 12
13 #if SK_SUPPORT_GPU 13 #if SK_SUPPORT_GPU
14 #include "GrContext.h" 14 #include "GrContext.h"
15 #endif 15 #endif
16 16
17 using namespace skiatest; 17 using namespace skiatest;
18 18
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 GpuTest::DestroyContexts(); 211 GpuTest::DestroyContexts();
212 212
213 return (failCount == 0) ? 0 : 1; 213 return (failCount == 0) ? 0 : 1;
214 } 214 }
215 215
216 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 216 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
217 int main(int argc, char * const argv[]) { 217 int main(int argc, char * const argv[]) {
218 return tool_main(argc, (char**) argv); 218 return tool_main(argc, (char**) argv);
219 } 219 }
220 #endif 220 #endif
OLDNEW
« no previous file with comments | « gyp/pathops_unittest.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698