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

Side by Side Diff: gm/tests/run.sh

Issue 29203002: GM: add --ignoreFailuresFile as an alternative to --ignoreTests (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: add_deprecation_warning Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Self-tests for gm, based on tools/tests/run.sh 3 # Self-tests for gm, based on tools/tests/run.sh
4 # 4 #
5 # These tests are run by the Skia_PerCommit_House_Keeping bot at every commit, 5 # These tests are run by the Skia_PerCommit_House_Keeping bot at every commit,
6 # so make sure that they still pass when you make changes to gm! 6 # so make sure that they still pass when you make changes to gm!
7 # 7 #
8 # To generate new baselines when gm behavior changes, run gm/tests/rebaseline.sh 8 # To generate new baselines when gm behavior changes, run gm/tests/rebaseline.sh
9 # 9 #
10 # TODO: because this is written as a shell script (instead of, say, Python) 10 # TODO: because this is written as a shell script (instead of, say, Python)
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/ide ntical-bytes.json" "$GM_OUTPUTS/compared-against-identical-bytes-json" 194 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/ide ntical-bytes.json" "$GM_OUTPUTS/compared-against-identical-bytes-json"
195 195
196 # Compare generated image against an input image file with identical pixels but different PNG encoding. 196 # Compare generated image against an input image file with identical pixels but different PNG encoding.
197 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/i dentical-pixels" "$GM_OUTPUTS/compared-against-identical-pixels-images" 197 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/i dentical-pixels" "$GM_OUTPUTS/compared-against-identical-pixels-images"
198 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/ide ntical-pixels.json" "$GM_OUTPUTS/compared-against-identical-pixels-json" 198 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/ide ntical-pixels.json" "$GM_OUTPUTS/compared-against-identical-pixels-json"
199 199
200 # Compare generated image against an input image file with different pixels. 200 # Compare generated image against an input image file with different pixels.
201 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/d ifferent-pixels" "$GM_OUTPUTS/compared-against-different-pixels-images" 201 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/d ifferent-pixels" "$GM_OUTPUTS/compared-against-different-pixels-images"
202 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/dif ferent-pixels.json" "$GM_OUTPUTS/compared-against-different-pixels-json" 202 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/dif ferent-pixels.json" "$GM_OUTPUTS/compared-against-different-pixels-json"
203 203
204 # Exercise --ignoreTests flag. 204 # Exercise --ignoreFailuresFile flag.
205 gm_test "--verbose --hierarchy --match selftest1 --ignoreTests 8888/selfte $CONF IGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignoring-one-test" 205 FAILURES_FILE="$GM_INPUTS/ignoreFailureFile"
206 echo "# Comment line" >$FAILURES_FILE
207 echo "" >>$FAILURES_FILE
208 echo "8888/selfte" >>$FAILURES_FILE
209 gm_test "--verbose --hierarchy --match selftest1 --ignoreFailuresFile $FAILURES_ FILE $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignoring-on e-test"
206 210
207 # Compare different pixels, but with a SUBSET of the expectations marked as 211 # Compare different pixels, but with a SUBSET of the expectations marked as
208 # ignore-failure. 212 # ignore-failure.
209 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/dif ferent-pixels-ignore-some-failures.json" "$GM_OUTPUTS/ignoring-some-failures" 213 gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/dif ferent-pixels-ignore-some-failures.json" "$GM_OUTPUTS/ignoring-some-failures"
210 214
211 # Compare generated image against an empty "expected image" dir. 215 # Compare generated image against an empty "expected image" dir.
212 # Even the tests that have been marked as ignore-failure should show up as 216 # Even the tests that have been marked as ignore-failure should show up as
213 # no-comparison. 217 # no-comparison.
214 gm_test "--verbose --hierarchy --match selftest1 --ignoreTests 8888 $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir" 218 gm_test "--verbose --hierarchy --match selftest1 --ignoreTests 8888 $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
215 219
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 for CASE in $FAILING_CASES; do 255 for CASE in $FAILING_CASES; do
252 assert_fails "python gm/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPE CTED_SUBDIR/json-summary.txt" 256 assert_fails "python gm/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPE CTED_SUBDIR/json-summary.txt"
253 done 257 done
254 258
255 if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then 259 if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then
256 echo "All tests passed." 260 echo "All tests passed."
257 exit 0 261 exit 0
258 else 262 else
259 exit 1 263 exit 1
260 fi 264 fi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698