| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 # Tests for our tools. | 3 # Tests for our tools. |
| 4 # | 4 # |
| 5 # TODO: currently, this only passes on Linux (which is the platform that | 5 # TODO: currently, this only passes on Linux (which is the platform that |
| 6 # the housekeeper bot runs on, e.g. | 6 # the housekeeper bot runs on, e.g. |
| 7 # http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/st
eps/RunToolSelfTests/logs/stdio ) | 7 # http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/st
eps/RunToolSelfTests/logs/stdio ) |
| 8 # See https://code.google.com/p/skia/issues/detail?id=677 | 8 # See https://code.google.com/p/skia/issues/detail?id=677 |
| 9 # ('make tools/tests/run.sh work cross-platform') | 9 # ('make tools/tests/run.sh work cross-platform') |
| 10 # Ideally, these tests should pass on all development platforms... | 10 # Ideally, these tests should pass on all development platforms... |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 fi | 260 fi |
| 261 | 261 |
| 262 # | 262 # |
| 263 # Test rebaseline.py ... | 263 # Test rebaseline.py ... |
| 264 # | 264 # |
| 265 | 265 |
| 266 REBASELINE_INPUT=tools/tests/rebaseline/input | 266 REBASELINE_INPUT=tools/tests/rebaseline/input |
| 267 REBASELINE_OUTPUT=tools/tests/rebaseline/output | 267 REBASELINE_OUTPUT=tools/tests/rebaseline/output |
| 268 | 268 |
| 269 # These test the old image-file expectations. | 269 # These test the old image-file expectations. |
| 270 rebaseline_images_test "--expectations-root fake/expectations/path --actuals-bas
e-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subd
irs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT
/subset" | 270 rebaseline_images_test "--expectations-root fake/expectations/path --actuals-bas
e-url file:$REBASELINE_INPUT/json1 --tests nonexistenttest1 imageblur nonexisten
ttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-andro
id-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset" |
| 271 rebaseline_images_test "--actuals-base-url file:nonexistent-path --tests test1 t
est2" "$REBASELINE_OUTPUT/all" | |
| 272 rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdir
s base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/u
sing-json1" | 271 rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdir
s base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/u
sing-json1" |
| 273 rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdir
s base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELIN
E_OUTPUT/using-json1-add-new" | 272 rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdir
s base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELIN
E_OUTPUT/using-json1-add-new" |
| 274 | 273 |
| 275 # These test the new JSON-format expectations. | 274 # These test the new JSON-format expectations. |
| 276 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/
json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBAS
ELINE_OUTPUT/using-json1-expectations" | 275 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/
json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBAS
ELINE_OUTPUT/using-json1-expectations" |
| 277 | 276 |
| 278 # | 277 # |
| 279 # Test jsondiff.py ... | 278 # Test jsondiff.py ... |
| 280 # | 279 # |
| 281 | 280 |
| 282 JSONDIFF_INPUT=tools/tests/jsondiff/input | 281 JSONDIFF_INPUT=tools/tests/jsondiff/input |
| 283 JSONDIFF_OUTPUT=tools/tests/jsondiff/output | 282 JSONDIFF_OUTPUT=tools/tests/jsondiff/output |
| 284 jsondiff_test "$JSONDIFF_INPUT/old.json $JSONDIFF_INPUT/new.json" "$JSONDIFF_OUT
PUT/old-vs-new" | 283 jsondiff_test "$JSONDIFF_INPUT/old.json $JSONDIFF_INPUT/new.json" "$JSONDIFF_OUT
PUT/old-vs-new" |
| 285 | 284 |
| 286 | 285 |
| 287 echo "All tests passed." | 286 echo "All tests passed." |
| OLD | NEW |