Chromium Code Reviews| Index: gm/tests/run.sh |
| =================================================================== |
| --- gm/tests/run.sh (revision 10989) |
| +++ gm/tests/run.sh (working copy) |
| @@ -68,7 +68,6 @@ |
| # 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 . |
| @@ -87,20 +86,9 @@ |
| 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 >/dev/null 2>/dev/null |
| 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 |
|
epoger
2013/08/28 19:43:04
Now that we aren't filtering stdout for these "GM:
|
| - 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 |