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

Side by Side Diff: dm/DM.cpp

Issue 1173363011: Update DM to respect blacklists for tests (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | 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 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 struct : public skiatest::Reporter { 667 struct : public skiatest::Reporter {
668 void reportFailed(const skiatest::Failure& failure) override { 668 void reportFailed(const skiatest::Failure& failure) override {
669 fail(failure.toString()); 669 fail(failure.toString());
670 JsonWriter::AddTestFailure(failure); 670 JsonWriter::AddTestFailure(failure);
671 } 671 }
672 bool allowExtendedTest() const override { 672 bool allowExtendedTest() const override {
673 return FLAGS_pathOpsExtended; 673 return FLAGS_pathOpsExtended;
674 } 674 }
675 bool verbose() const override { return FLAGS_veryVerbose; } 675 bool verbose() const override { return FLAGS_veryVerbose; }
676 } reporter; 676 } reporter;
677
678 SkString note;
679 SkString whyBlacklisted = is_blacklisted("_", "tests", "_", test->name);
680 if (!whyBlacklisted.isEmpty()) {
681 note.appendf(" (--blacklist %s)", whyBlacklisted.c_str());
682 }
683
677 WallTimer timer; 684 WallTimer timer;
678 timer.start(); 685 timer.start();
679 if (!FLAGS_dryRun) { 686 if (!FLAGS_dryRun && whyBlacklisted.isEmpty()) {
680 start("unit", "test", "", test->name); 687 start("unit", "test", "", test->name);
681 GrContextFactory factory; 688 GrContextFactory factory;
682 if (FLAGS_pre_log) { 689 if (FLAGS_pre_log) {
683 SkDebugf("\nRunning test %s", test->name); 690 SkDebugf("\nRunning test %s", test->name);
684 } 691 }
685 test->proc(&reporter, &factory); 692 test->proc(&reporter, &factory);
686 } 693 }
687 timer.end(); 694 timer.end();
688 done(timer.fWall, "unit", "test", "", test->name, "", ""); 695 done(timer.fWall, "unit", "test", "", test->name, note, "");
689 } 696 }
690 697
691 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 698 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
692 699
693 // If we're isolating all GPU-bound work to one thread (the default), this funct ion runs all that. 700 // If we're isolating all GPU-bound work to one thread (the default), this funct ion runs all that.
694 static void run_enclave_and_gpu_tests(SkTArray<Task>* tasks) { 701 static void run_enclave_and_gpu_tests(SkTArray<Task>* tasks) {
695 run_enclave(tasks); 702 run_enclave(tasks);
696 for (int i = 0; i < gGPUTests.count(); i++) { 703 for (int i = 0; i < gGPUTests.count(); i++) {
697 run_test(&gGPUTests[i]); 704 run_test(&gGPUTests[i]);
698 } 705 }
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 } 813 }
807 return 0; 814 return 0;
808 } 815 }
809 816
810 #if !defined(SK_BUILD_FOR_IOS) 817 #if !defined(SK_BUILD_FOR_IOS)
811 int main(int argc, char** argv) { 818 int main(int argc, char** argv) {
812 SkCommandLineFlags::Parse(argc, argv); 819 SkCommandLineFlags::Parse(argc, argv);
813 return dm_main(); 820 return dm_main();
814 } 821 }
815 #endif 822 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698