Roll out r6843 to hopefully fix Windows builds

BUG=https://code.google.com/p/skia/issues/detail?id=1023
TBR=borenet
Review URL: https://codereview.appspot.com/6942061

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

11 files changed, 3 insertions, 78 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
index 4253e730ef..ef8c5afda4 100644
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/different-pixels --writeJsonSummary gm/tests/outputs/compared-against-different-pixels/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-different-pixels/output-actual/images
+out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/different-pixels -w gm/tests/outputs/compared-against-different-pixels/output-actual/images
diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt
deleted file mode 100644
index 179c60c162..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-   "actual-results" : {
-      "failed" : {
-         "8888/dashing2" : {
-            "checksum" : 2675870163990933333
-         }
-      },
-      "failure-ignored" : null,
-      "succeeded" : null
-   },
-   "expected-results" : {
-      "8888/dashing2" : {
-         "checksums" : [ 15161495552186645995 ],
-         "ignore-failure" : false
-      }
-   }
-}
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
deleted file mode 100644
index 0ee96beddd..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/empty-dir --writeJsonSummary gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-empty-dir/output-actual/images
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png
deleted file mode 100644
index 465c0199df..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png
+++ /dev/null
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
deleted file mode 100644
index 935ba5037d..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-   "actual-results" : {
-      "failed" : null,
-      "failure-ignored" : {
-         "8888/dashing2" : {
-            "checksum" : 2675870163990933333
-         }
-      },
-      "succeeded" : null
-   },
-   "expected-results" : {
-      "8888/dashing2" : {
-         "checksums" : null,
-         "ignore-failure" : true
-      }
-   }
-}
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value b/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
deleted file mode 100644
index 436554d29e..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-reading from gm/tests/inputs/empty-dir
-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
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
index 556498ab12..6e89999781 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-bytes --writeJsonSummary gm/tests/outputs/compared-against-identical-bytes/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-identical-bytes/output-actual/images
+out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-bytes -w gm/tests/outputs/compared-against-identical-bytes/output-actual/images
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt
deleted file mode 100644
index cbb28e1172..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-   "actual-results" : {
-      "failed" : null,
-      "failure-ignored" : null,
-      "succeeded" : {
-         "8888/dashing2" : {
-            "checksum" : 2675870163990933333
-         }
-      }
-   },
-   "expected-results" : {
-      "8888/dashing2" : {
-         "checksums" : [ 2675870163990933333 ],
-         "ignore-failure" : false
-      }
-   }
-}
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
index ecdef271da..285cef2125 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-pixels --writeJsonSummary gm/tests/outputs/compared-against-identical-pixels/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-identical-pixels/output-actual/images
+out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-pixels -w gm/tests/outputs/compared-against-identical-pixels/output-actual/images
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt
deleted file mode 100644
index cbb28e1172..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-   "actual-results" : {
-      "failed" : null,
-      "failure-ignored" : null,
-      "succeeded" : {
-         "8888/dashing2" : {
-            "checksum" : 2675870163990933333
-         }
-      }
-   },
-   "expected-results" : {
-      "8888/dashing2" : {
-         "checksums" : [ 2675870163990933333 ],
-         "ignore-failure" : false
-      }
-   }
-}