Revert r11102 (mistakenly committed)
git-svn-id: http://skia.googlecode.com/svn/trunk@11103 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
index 6c22970..73d0a23 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@@ -8129,4 +8129,4 @@
"ignore-failure": false
}
}
-}
\ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index 5e1c2c3..bbb4529 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -8117,4 +8117,4 @@
"ignore-failure": false
}
}
-}
\ No newline at end of file
+}
diff --git a/tools/rebaseline.py b/tools/rebaseline.py
index eab3598..a1e3c57 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -257,7 +257,7 @@
# because we don't want to add annotation fields (such as
# JSONKEY_EXPECTEDRESULTS_BUGS) except for tests whose expectations we
# are actually modifying.
- sections = [gm_json.JSONKEY_ACTUALRESULTS_FAILED, gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON, gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED]
+ sections = [gm_json.JSONKEY_ACTUALRESULTS_FAILED]
if self._add_new:
sections.append(gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON)
results_to_update = self._GetActualResults(json_url=actuals_url,
@@ -291,9 +291,6 @@
expected_results[image_name]\
[gm_json.JSONKEY_EXPECTEDRESULTS_ALLOWEDDIGESTS]\
= [image_results]
- expected_results[image_name]\
- [gm_json.JSONKEY_EXPECTEDRESULTS_IGNOREFAILURE]\
- = True
if self._mark_unreviewed:
expected_results[image_name]\
[gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED]\