AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skip empty directories and input files not ending in .skp in *_pictures

Browse Source 
Addressing https://code.google.com/p/skia/issues/detail?id=886
Review URL: https://codereview.appspot.com/6531047

git-svn-id: http://skia.googlecode.com/svn/trunk@5597 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
borenet@google.com 2012-09-19 17:28:29 +00:00
parent 2a006c1127
commit 57837bff3d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/bench_pictures_main.cpp
View File

@ -405,12 +405,18 @@ static int process_input(const SkString& input,
do { do {
SkString inputPath; SkString inputPath;
sk_tools::make_filepath(&inputPath, input, inputFilename); sk_tools::make_filepath(&inputPath, input, inputFilename);
if (!run_single_benchmark(inputPath, benchmark)) if (!run_single_benchmark(inputPath, benchmark)) {
++failures; ++failures;
}
} while(iter.next(&inputFilename)); } while(iter.next(&inputFilename));
} else { } else if (SkStrEndsWith(input.c_str(), ".skp")) {
if (!run_single_benchmark(input, benchmark)) if (!run_single_benchmark(input, benchmark)) {
++failures; ++failures;
}
} else {
SkString warning;
warning.printf("Warning: skipping %s\n", input.c_str());
gLogger.logError(warning);
} }
return failures; return failures;
} }

16
tools/render_pictures_main.cpp
View File

@ -137,13 +137,19 @@ static int process_input(const SkString& input, const SkString& outputDir,
do { do {
SkString inputPath; SkString inputPath;
sk_tools::make_filepath(&inputPath, input, inputFilename); sk_tools::make_filepath(&inputPath, input, inputFilename);
if (!render_picture(inputPath, outputDir, renderer)) if (!render_picture(inputPath, outputDir, renderer)) {
++failures; ++failures;
}
} while(iter.next(&inputFilename)); } while(iter.next(&inputFilename));
} else { } else if (SkStrEndsWith(input.c_str(), ".skp")) {
SkString inputPath(input); SkString inputPath(input);
if (!render_picture(inputPath, outputDir, renderer)) if (!render_picture(inputPath, outputDir, renderer)) {
++failures; ++failures;
}
} else {
SkString warning;
warning.printf("Warning: skipping %s\n", input.c_str());
SkDebugf(warning.c_str());
} }
return failures; return failures;
} }