diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-05 18:44:31 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-05 18:44:31 +0000 |
| commit | c69b0d0ee5d0e0f4ada6803e9e6da1c617c0ba57 (patch) | |
| tree | aa1f5f565654522cee89e239b2326f4edb8f2884 /gm/tests/run.sh | |
| parent | c4b12f19a46946e1c02f3525e0ea4902b09feac5 (diff) | |
gm self-test: stop checking stdout and stderr
BUG=skia:1568
NOTRY=True
R=bsalomon@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/156023002
git-svn-id: http://skia.googlecode.com/svn/trunk@13324 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/tests/run.sh')
| -rwxr-xr-x | gm/tests/run.sh | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gm/tests/run.sh b/gm/tests/run.sh index 29074e5f1d..333f3effc0 100755 --- a/gm/tests/run.sh +++ b/gm/tests/run.sh @@ -70,7 +70,6 @@ function assert_fails { # Run gm... # - with the arguments in $1 -# - writing stdout into $2/$OUTPUT_ACTUAL_SUBDIR/stdout # - writing json summary into $2/$OUTPUT_ACTUAL_SUBDIR/json-summary.txt # - writing return value into $2/$OUTPUT_ACTUAL_SUBDIR/return_value # Then compare all of those against $2/$OUTPUT_EXPECTED_SUBDIR . @@ -89,20 +88,9 @@ function gm_test { COMMAND="$GM_BINARY $GM_ARGS --writeJsonSummaryPath $JSON_SUMMARY_FILE --writePath $ACTUAL_OUTPUT_DIR/writePath --mismatchPath $ACTUAL_OUTPUT_DIR/mismatchPath --missingExpectationsPath $ACTUAL_OUTPUT_DIR/missingExpectationsPath" - echo "$COMMAND" >$ACTUAL_OUTPUT_DIR/command_line - $COMMAND >$ACTUAL_OUTPUT_DIR/stdout 2>$ACTUAL_OUTPUT_DIR/stderr + $COMMAND echo $? >$ACTUAL_OUTPUT_DIR/return_value - # Only compare selected lines in the stdout, to ignore any spurious lines - # as noted in http://code.google.com/p/skia/issues/detail?id=1068 . - # - # TODO(epoger): This is still hacky... we need to rewrite this script in - # Python soon, and make stuff like this more maintainable. - grep ^GM: $ACTUAL_OUTPUT_DIR/stdout >$ACTUAL_OUTPUT_DIR/stdout-tmp - mv $ACTUAL_OUTPUT_DIR/stdout-tmp $ACTUAL_OUTPUT_DIR/stdout - grep ^GM: $ACTUAL_OUTPUT_DIR/stderr >$ACTUAL_OUTPUT_DIR/stderr-tmp - mv $ACTUAL_OUTPUT_DIR/stderr-tmp $ACTUAL_OUTPUT_DIR/stderr - # Replace image file contents with just the filename, for two reasons: # 1. Image file encoding may vary by platform # 2. https://code.google.com/p/chromium/issues/detail?id=169600 @@ -279,9 +267,11 @@ done # Exercise all rebaseline_server unittests. assert_passes "python gm/rebaseline_server/test_all.py" +echo if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then echo "All tests passed." exit 0 else + echo "Some tests failed." exit 1 fi |