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

GM: remove deprecated --ignoreTests flag

Browse Source 
BUG=skia:1730
R=borenet@google.com

Review URL: https://codereview.chromium.org/27983004

git-svn-id: http://skia.googlecode.com/svn/trunk@11887 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com 2013-10-21 17:25:26 +00:00
parent 8c294900f3
commit 00434ec9e8
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gm/gmmain.cpp
View File

@ -1425,9 +1425,6 @@ DEFINE_string(ignoreErrorTypes, kDefaultIgnorableErrorTypes.asString(" ").c_str(
DEFINE_string(ignoreFailuresFile, "", "Path to file containing a list of tests for which we "
"should ignore failures.\n"
"The file should list one test per line, except for comment lines starting with #");
DEFINE_string(ignoreTests, "", "Space delimited list of tests for which we should ignore "
"failures.\n"
"DEPRECATED in favor of --ignoreFailuresFile; see bug 1730");
DEFINE_string(match, "", "[~][^]substring[$] [...] of test name to run.\n"
"Multiple matches may be separated by spaces.\n"
"~ causes a matching test to always be skipped\n"
@ -2062,14 +2059,6 @@ static bool parse_flags_ignore_error_types(ErrorCombination* outErrorTypes) {
static bool parse_flags_ignore_tests(SkTArray<SkString> &ignoreTestSubstrings) {
ignoreTestSubstrings.reset();
// Parse --ignoreTests
if (FLAGS_ignoreTests.count() > 0) {
gm_fprintf(stderr, "you are using deprecated --ignoreTests flag\n");
for (int i = 0; i < FLAGS_ignoreTests.count(); i++) {
ignoreTestSubstrings.push_back(SkString(FLAGS_ignoreTests[i]));
}
}
// Parse --ignoreFailuresFile
for (int i = 0; i < FLAGS_ignoreFailuresFile.count(); i++) {
SkTArray<SkString> linesFromFile;

2
gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
View File

@ -1 +1 @@
out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreTests 8888 --config 8888 565 -r gm/tests/inputs/images/empty-dir --writeJsonSummaryPath gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-empty-dir/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-empty-dir/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath
out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --config 8888 565 -r gm/tests/inputs/images/empty-dir --writeJsonSummaryPath gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-empty-dir/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-empty-dir/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath

1
gm/tests/outputs/compared-against-empty-dir/output-expected/stderr
View File

@ -1 +0,0 @@
GM: you are using deprecated --ignoreTests flag

2
gm/tests/outputs/ignoring-one-test/output-expected/command_line
View File

@ -1 +1 @@
out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreFailuresFile gm/tests/inputs/ignoreFailureFile --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignoring-one-test/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-one-test/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath
out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignoring-one-test/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-one-test/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath

15
gm/tests/run.sh
View File

@ -180,12 +180,19 @@ function create_inputs_dir {
--writeJsonSummaryPath $JSON_DIR/different-pixels-no-hierarchy.json
mkdir -p $IMAGES_DIR/empty-dir
echo "# Comment line" >$GM_IGNORE_FAILURES_FILE
echo "" >>$GM_IGNORE_FAILURES_FILE
echo "# ignore any test runs whose filename contains '8888/selfte'" >>$GM_IGNORE_FAILURES_FILE
echo "# (in other words, config is 8888 and test name starts with 'selfte')" >>$GM_IGNORE_FAILURES_FILE
echo "8888/selfte" >>$GM_IGNORE_FAILURES_FILE
}
GM_TESTDIR=gm/tests
GM_INPUTS=$GM_TESTDIR/inputs
GM_OUTPUTS=$GM_TESTDIR/outputs
GM_TEMPFILES=$GM_TESTDIR/tempfiles
GM_IGNORE_FAILURES_FILE=$GM_INPUTS/ignored-tests.txt
create_inputs_dir $GM_INPUTS
@ -202,11 +209,7 @@ gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/d
gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/compared-against-different-pixels-json"
# Exercise --ignoreFailuresFile flag.
FAILURES_FILE="$GM_INPUTS/ignoreFailureFile"
echo "# Comment line" >$FAILURES_FILE
echo "" >>$FAILURES_FILE
echo "8888/selfte" >>$FAILURES_FILE
gm_test "--verbose --hierarchy --match selftest1 --ignoreFailuresFile $FAILURES_FILE $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignoring-one-test"
gm_test "--verbose --hierarchy --match selftest1 --ignoreFailuresFile $GM_IGNORE_FAILURES_FILE $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignoring-one-test"
# Compare different pixels, but with a SUBSET of the expectations marked as
# ignore-failure.
@ -215,7 +218,7 @@ gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/dif
# Compare generated image against an empty "expected image" dir.
# Even the tests that have been marked as ignore-failure should show up as
# no-comparison.
gm_test "--verbose --hierarchy --match selftest1 --ignoreTests 8888 $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
gm_test "--verbose --hierarchy --match selftest1 --ignoreFailuresFile $GM_IGNORE_FAILURES_FILE $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
# Compare generated image against a nonexistent "expected image" dir.
gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r ../path/to/nowhere" "$GM_OUTPUTS/compared-against-nonexistent-dir"