OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 "DMJsonWriter.h" | 9 #include "DMJsonWriter.h" |
10 #include "DMSrcSink.h" | 10 #include "DMSrcSink.h" |
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 case kGPU_Enclave: | 790 case kGPU_Enclave: |
791 tg.add(run_enclave_and_gpu_tests, &enclaves[i]); | 791 tg.add(run_enclave_and_gpu_tests, &enclaves[i]); |
792 break; | 792 break; |
793 default: | 793 default: |
794 tg.add(run_enclave, &enclaves[i]); | 794 tg.add(run_enclave, &enclaves[i]); |
795 break; | 795 break; |
796 } | 796 } |
797 } | 797 } |
798 tg.wait(); | 798 tg.wait(); |
799 // At this point we're back in single-threaded land. | 799 // At this point we're back in single-threaded land. |
| 800 sk_tool_utils::release_portable_typefaces(); |
800 | 801 |
801 SkDebugf("\n"); | 802 SkDebugf("\n"); |
802 if (gFailures.count() > 0) { | 803 if (gFailures.count() > 0) { |
803 SkDebugf("Failures:\n"); | 804 SkDebugf("Failures:\n"); |
804 for (int i = 0; i < gFailures.count(); i++) { | 805 for (int i = 0; i < gFailures.count(); i++) { |
805 SkDebugf("\t%s\n", gFailures[i].c_str()); | 806 SkDebugf("\t%s\n", gFailures[i].c_str()); |
806 } | 807 } |
807 SkDebugf("%d failures\n", gFailures.count()); | 808 SkDebugf("%d failures\n", gFailures.count()); |
808 return 1; | 809 return 1; |
809 } | 810 } |
810 if (gPending > 0) { | 811 if (gPending > 0) { |
811 SkDebugf("Hrm, we didn't seem to run everything we intended to! Please
file a bug.\n"); | 812 SkDebugf("Hrm, we didn't seem to run everything we intended to! Please
file a bug.\n"); |
812 return 1; | 813 return 1; |
813 } | 814 } |
814 return 0; | 815 return 0; |
815 } | 816 } |
816 | 817 |
817 #if !defined(SK_BUILD_FOR_IOS) | 818 #if !defined(SK_BUILD_FOR_IOS) |
818 int main(int argc, char** argv) { | 819 int main(int argc, char** argv) { |
819 SkCommandLineFlags::Parse(argc, argv); | 820 SkCommandLineFlags::Parse(argc, argv); |
820 return dm_main(); | 821 return dm_main(); |
821 } | 822 } |
822 #endif | 823 #endif |
OLD | NEW |