| 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 #include "OverwriteLine.h" | 8 #include "OverwriteLine.h" | 
| 9 #include "SkCommandLineFlags.h" | 9 #include "SkCommandLineFlags.h" | 
| 10 #include "SkGraphics.h" | 10 #include "SkGraphics.h" | 
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 159         SkString resourcePath = Test::GetResourcePath(); | 159         SkString resourcePath = Test::GetResourcePath(); | 
| 160         if (!resourcePath.isEmpty()) { | 160         if (!resourcePath.isEmpty()) { | 
| 161             header.appendf(" --resourcePath %s", resourcePath.c_str()); | 161             header.appendf(" --resourcePath %s", resourcePath.c_str()); | 
| 162         } | 162         } | 
| 163 #ifdef SK_DEBUG | 163 #ifdef SK_DEBUG | 
| 164         header.append(" SK_DEBUG"); | 164         header.append(" SK_DEBUG"); | 
| 165 #else | 165 #else | 
| 166         header.append(" SK_RELEASE"); | 166         header.append(" SK_RELEASE"); | 
| 167 #endif | 167 #endif | 
| 168         header.appendf(" skia_arch_width=%d", (int)sizeof(void*) * 8); | 168         header.appendf(" skia_arch_width=%d", (int)sizeof(void*) * 8); | 
|  | 169         if (FLAGS_veryVerbose) { | 
|  | 170             header.appendf("\n"); | 
|  | 171         } | 
| 169         SkDebugf(header.c_str()); | 172         SkDebugf(header.c_str()); | 
| 170     } | 173     } | 
| 171 | 174 | 
| 172 | 175 | 
| 173     // Count tests first. | 176     // Count tests first. | 
| 174     int total = 0; | 177     int total = 0; | 
| 175     int toRun = 0; | 178     int toRun = 0; | 
| 176     Test* test; | 179     Test* test; | 
| 177 | 180 | 
| 178     Iter iter; | 181     Iter iter; | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 228 | 231 | 
| 229     SkDebugf("\n"); | 232     SkDebugf("\n"); | 
| 230     return (failCount == 0) ? 0 : 1; | 233     return (failCount == 0) ? 0 : 1; | 
| 231 } | 234 } | 
| 232 | 235 | 
| 233 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 236 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 
| 234 int main(int argc, char * const argv[]) { | 237 int main(int argc, char * const argv[]) { | 
| 235     return tool_main(argc, (char**) argv); | 238     return tool_main(argc, (char**) argv); | 
| 236 } | 239 } | 
| 237 #endif | 240 #endif | 
| OLD | NEW | 
|---|