better quick fix for GM self-test: ignore instance-counting lines in Debug output

BUG=http://code.google.com/p/skia/issues/detail?id=1068
Review URL: https://codereview.appspot.com/7127044

git-svn-id: http://skia.googlecode.com/svn/trunk@7214 2bbb7eff-a529-9590-31e7-b0007b416f81

6 files changed, 6 insertions, 30 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
index dd4d6395a0..e4dbd8cb4d 100644
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
@@ -4,9 +4,3 @@ writing to gm/tests/outputs/compared-against-different-pixels/output-actual/imag
 drawing... dashing2 [640 480]
 Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
 		8888/dashing2 pixel_error
-  Leaked SkRefCnt: 190
-     Leaked SkFlattenable: 1
-         Leaked SkData: 1
-     Leaked SkPathRef: 1
-     Leaked SkWeakRefCnt: 188
-         Leaked SkTypeface: 188
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
index 7f50a62182..86216686aa 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
@@ -4,9 +4,3 @@ writing to gm/tests/outputs/compared-against-empty-dir/output-actual/images
 drawing... dashing2 [640 480]
 FAILED to read gm/tests/inputs/empty-dir/8888/dashing2.png
 Ran 1 tests: 0 passed, 0 failed, 1 missing reference images
-  Leaked SkRefCnt: 190
-     Leaked SkFlattenable: 1
-         Leaked SkData: 1
-     Leaked SkPathRef: 1
-     Leaked SkWeakRefCnt: 188
-         Leaked SkTypeface: 188
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
index e6befbaee2..8e67783ef7 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
@@ -3,9 +3,3 @@ reading from gm/tests/inputs/identical-bytes
 writing to gm/tests/outputs/compared-against-identical-bytes/output-actual/images
 drawing... dashing2 [640 480]
 Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
-  Leaked SkRefCnt: 190
-     Leaked SkFlattenable: 1
-         Leaked SkData: 1
-     Leaked SkPathRef: 1
-     Leaked SkWeakRefCnt: 188
-         Leaked SkTypeface: 188
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
index aba79a8275..8829ef564f 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
@@ -3,9 +3,3 @@ reading from gm/tests/inputs/identical-pixels
 writing to gm/tests/outputs/compared-against-identical-pixels/output-actual/images
 drawing... dashing2 [640 480]
 Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
-  Leaked SkRefCnt: 190
-     Leaked SkFlattenable: 1
-         Leaked SkData: 1
-     Leaked SkPathRef: 1
-     Leaked SkWeakRefCnt: 188
-         Leaked SkTypeface: 188
diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout
index df6fc538ac..61b3131c6c 100644
--- a/gm/tests/outputs/no-readpath/output-expected/stdout
+++ b/gm/tests/outputs/no-readpath/output-expected/stdout
@@ -2,9 +2,3 @@ Non-default runtime configuration options:
 writing to gm/tests/outputs/no-readpath/output-actual/images
 drawing... dashing2 [640 480]
 Ran 1 tests: 0 passed, 0 failed, 1 missing reference images
-  Leaked SkRefCnt: 190
-     Leaked SkFlattenable: 1
-         Leaked SkData: 1
-     Leaked SkPathRef: 1
-     Leaked SkWeakRefCnt: 188
-         Leaked SkTypeface: 188
diff --git a/gm/tests/run.sh b/gm/tests/run.sh
index c23e145f0a..2c9b719050 100755
--- a/gm/tests/run.sh
+++ b/gm/tests/run.sh
@@ -60,6 +60,12 @@ function gm_test {
   $COMMAND &>$ACTUAL_OUTPUT_DIR/stdout
   echo $? >$ACTUAL_OUTPUT_DIR/return_value
 
+  # Temporary hack to alleviate
+  # http://code.google.com/p/skia/issues/detail?id=1068 ('GM self-test failures')
+  # (Remove instance-counting lines from the Debug output)
+  grep -v Leaked $ACTUAL_OUTPUT_DIR/stdout >$ACTUAL_OUTPUT_DIR/stdout-tmp
+  mv $ACTUAL_OUTPUT_DIR/stdout-tmp $ACTUAL_OUTPUT_DIR/stdout
+
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }