diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 19:04:05 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 19:04:05 +0000 |
| commit | 3f0a10858672e38e44ccafb7895cc1b887807db8 (patch) | |
| tree | f648063ac95f433034afeb09be131e680965e4b9 | |
| parent | 5a6cd35b1961a1a3dea242c902300cafbd68fdc0 (diff) | |
Remove temporary workaround TODOs from tools/tests/run.sh
R=rmistry@google.com
Review URL: https://codereview.chromium.org/23490009
git-svn-id: http://skia.googlecode.com/svn/trunk@10989 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rwxr-xr-x | tools/tests/run.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tools/tests/run.sh b/tools/tests/run.sh index b8fa89af5e..16c00d7d01 100755 --- a/tools/tests/run.sh +++ b/tools/tests/run.sh @@ -148,10 +148,7 @@ function rebaseline_test { rm -rf $ACTUAL_OUTPUT_DIR mkdir -p $ACTUAL_OUTPUT_DIR EXPECTATIONS_TO_MODIFY_DIR="$ACTUAL_OUTPUT_DIR/gm-expectations" - # TODO(epoger): Temporarily exclude expectations subdirs with old base-* names, - # during a transition period (we need the svn rm of those subdirs to take - # effect) - BUILDERS=$(ls $COPY_EXPECTATIONS_FROM_DIR | grep -v ^base-) + BUILDERS=$(ls $COPY_EXPECTATIONS_FROM_DIR) for BUILDER in $BUILDERS; do mkdir -p $EXPECTATIONS_TO_MODIFY_DIR/$BUILDER cp $COPY_EXPECTATIONS_FROM_DIR/$BUILDER/expected-results.json \ @@ -162,17 +159,7 @@ function rebaseline_test { $COMMAND &>$ACTUAL_OUTPUT_DIR/stdout echo $? >$ACTUAL_OUTPUT_DIR/return_value - # TODO(epoger): Temporarily override compare_directories with a comparison - # that excludes expectations subdirs with old base-* names, - # during a transition period (we need the svn rm of those subdirs to take - # effect) - # - # WAS: compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR - diff --recursive --exclude=.* --exclude=base-* $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR - if [ $? != 0 ]; then - echo "failed in: compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR" - exit 1 - fi + compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR } # Run jsondiff.py with arguments in $1, recording its output. |