aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json2
-rw-r--r--expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json2
-rwxr-xr-xtools/rebaseline.py5
3 files changed, 6 insertions, 3 deletions
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 73d0a23a67..6c22970059 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 bbb4529096..5e1c2c3126 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 a1e3c576b4..eab3598be1 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -257,7 +257,7 @@ class JsonRebaseliner(object):
# 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]
+ sections = [gm_json.JSONKEY_ACTUALRESULTS_FAILED, gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON, gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED]
if self._add_new:
sections.append(gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON)
results_to_update = self._GetActualResults(json_url=actuals_url,
@@ -291,6 +291,9 @@ class JsonRebaseliner(object):
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]\