Bugfix that cause skpdiff to segfault.

tools/tests/render_pictures_test.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Test the render_pictures binary.
 """
@@ skipping 18 matching lines @@
 EXPECTED_HEADER_CONTENTS = {
     "type" : "ChecksummedImages",
     "revision" : 1,
 }
 
 # Manually verified: 640x400 red rectangle with black border
 # Standard expectations will be set up in such a way that this image fails
 # the comparison.
 RED_WHOLEIMAGE = {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 11092453015575919668,
+    "checksumValue" : 2853310525600416231,
     "comparisonResult" : "failed",
     "filepath" : "red_skp.png",
 }
 
 # Manually verified: 640x400 green rectangle with black border
 # Standard expectations will be set up in such a way that this image passes
 # the comparison.
 GREEN_WHOLEIMAGE = {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 8891695120562235492,
+    "checksumValue" : 11143979097452425335,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp.png",
 }
 
 # Manually verified these 6 images, all 256x256 tiles,
 # consistent with a tiled version of the 640x400 red rect
 # with black borders.
 # Standard expectations will be set up in such a way that these images fail
 # the comparison.
 RED_TILES = [{
     "checksumAlgorithm" : "bitmap-64bitMD5",
     "checksumValue" : 5815827069051002745,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile0.png",
 },{
     "checksumAlgorithm" : "bitmap-64bitMD5",
     "checksumValue" : 9323613075234140270,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile1.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 16670399404877552232,
+    "checksumValue" : 15939355025996362179,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile2.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 2507897274083364964,
+    "checksumValue" : 649771916797529222,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile3.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 7325267995523877959,
+    "checksumValue" : 8132820002266077288,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile4.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 2181381724594493116,
+    "checksumValue" : 2406160701181324581,
     "comparisonResult" : "failed",
     "filepath" : "red_skp-tile5.png",
 }]
 
 # Manually verified these 6 images, all 256x256 tiles,
 # consistent with a tiled version of the 640x400 green rect
 # with black borders.
 # Standard expectations will be set up in such a way that these images pass
 # the comparison.
 GREEN_TILES = [{
     "checksumAlgorithm" : "bitmap-64bitMD5",
     "checksumValue" : 12587324416545178013,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile0.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
     "checksumValue" : 7624374914829746293,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile1.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 5686489729535631913,
+    "checksumValue" : 11866144860997809880,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile2.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 7980646035555096146,
+    "checksumValue" : 3893392565127823822,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile3.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 17817086664365875131,
+    "checksumValue" : 2083084978343901738,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile4.png",
 }, {
     "checksumAlgorithm" : "bitmap-64bitMD5",
-    "checksumValue" : 10673669813016809363,
+    "checksumValue" : 89620927366502076,
     "comparisonResult" : "succeeded",
     "filepath" : "green_skp-tile5.png",
 }]
 
 
 def modified_dict(input_dict, modification_dict):
   """Returns a dict, with some modifications applied to it.
 
   Args:
     input_dict: a dictionary (which will be copied, not modified in place)
@@ skipping 244 matching lines @@
         "image-base-gs-url" : None,
         "descriptions" : {
             "builder": "builderName",
             "renderMode": "renderModeName",
         },
         "actual-results" : {
             "red.skp": {
                 # Manually verified: 640x400 red rectangle with black border
                 "whole-image": {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 11092453015575919668,
+                    "checksumValue" : 2853310525600416231,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "red_skp/bitmap-64bitMD5_11092453015575919668.png",
+                        "red_skp/bitmap-64bitMD5_2853310525600416231.png",
                 },
             },
             "green.skp": {
                 # Manually verified: 640x400 green rectangle with black border
                 "whole-image": {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 8891695120562235492,
+                    "checksumValue" : 11143979097452425335,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "green_skp/bitmap-64bitMD5_8891695120562235492.png",
+                        "green_skp/bitmap-64bitMD5_11143979097452425335.png",
                 },
             }
         }
     }
     self._assert_json_contents(output_json_path, expected_summary_dict)
     self._assert_directory_contents(write_path_dir, ['red_skp', 'green_skp'])
     self._assert_directory_contents(
         os.path.join(write_path_dir, 'red_skp'),
-        ['bitmap-64bitMD5_11092453015575919668.png'])
+        ['bitmap-64bitMD5_2853310525600416231.png'])
     self._assert_directory_contents(
         os.path.join(write_path_dir, 'green_skp'),
-        ['bitmap-64bitMD5_8891695120562235492.png'])
+        ['bitmap-64bitMD5_11143979097452425335.png'])
 
   def test_untiled_validate(self):
     """Same as test_untiled, but with --validate."""
     self._test_untiled(additional_args=['--validate'])
 
   def test_untiled_without_writePath(self):
     """Same as test_untiled, but without --writePath."""
     output_json_path = os.path.join(self._output_dir, 'actuals.json')
     self._generate_skps()
     expectations_path = self._create_expectations()
@@ skipping 114 matching lines @@
                     "filepath" :
                         "red_skp/bitmap-64bitMD5_5815827069051002745.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
                     "checksumValue" : 9323613075234140270,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
                         "red_skp/bitmap-64bitMD5_9323613075234140270.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 16670399404877552232,
+                    "checksumValue" : 15939355025996362179,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "red_skp/bitmap-64bitMD5_16670399404877552232.png",
+                        "red_skp/bitmap-64bitMD5_15939355025996362179.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 2507897274083364964,
+                    "checksumValue" : 649771916797529222,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "red_skp/bitmap-64bitMD5_2507897274083364964.png",
+                        "red_skp/bitmap-64bitMD5_649771916797529222.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 7325267995523877959,
+                    "checksumValue" : 8132820002266077288,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "red_skp/bitmap-64bitMD5_7325267995523877959.png",
+                        "red_skp/bitmap-64bitMD5_8132820002266077288.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 2181381724594493116,
+                    "checksumValue" : 2406160701181324581,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "red_skp/bitmap-64bitMD5_2181381724594493116.png",
+                        "red_skp/bitmap-64bitMD5_2406160701181324581.png",
                 }],
             },
             "green.skp": {
                 # Manually verified these 6 images, all 256x256 tiles,
                 # consistent with a tiled version of the 640x400 green rect
                 # with black borders.
                 "tiled-images": [{
                     "checksumAlgorithm" : "bitmap-64bitMD5",
                     "checksumValue" : 12587324416545178013,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
                         "green_skp/bitmap-64bitMD5_12587324416545178013.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
                     "checksumValue" : 7624374914829746293,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
                         "green_skp/bitmap-64bitMD5_7624374914829746293.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 5686489729535631913,
+                    "checksumValue" : 11866144860997809880,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "green_skp/bitmap-64bitMD5_5686489729535631913.png",
+                        "green_skp/bitmap-64bitMD5_11866144860997809880.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 7980646035555096146,
+                    "checksumValue" : 3893392565127823822,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "green_skp/bitmap-64bitMD5_7980646035555096146.png",
+                        "green_skp/bitmap-64bitMD5_3893392565127823822.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 17817086664365875131,
+                    "checksumValue" : 2083084978343901738,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "green_skp/bitmap-64bitMD5_17817086664365875131.png",
+                        "green_skp/bitmap-64bitMD5_2083084978343901738.png",
                 }, {
                     "checksumAlgorithm" : "bitmap-64bitMD5",
-                    "checksumValue" : 10673669813016809363,
+                    "checksumValue" : 89620927366502076,
                     "comparisonResult" : "no-comparison",
                     "filepath" :
-                        "green_skp/bitmap-64bitMD5_10673669813016809363.png",
+                        "green_skp/bitmap-64bitMD5_89620927366502076.png",
                 }],
             }
         }
     }
     self._assert_json_contents(output_json_path, expected_summary_dict)
     self._assert_directory_contents(write_path_dir, ['red_skp', 'green_skp'])
     self._assert_directory_contents(
         os.path.join(write_path_dir, 'red_skp'),
         ['bitmap-64bitMD5_5815827069051002745.png',
          'bitmap-64bitMD5_9323613075234140270.png',
-         'bitmap-64bitMD5_16670399404877552232.png',
-         'bitmap-64bitMD5_2507897274083364964.png',
-         'bitmap-64bitMD5_7325267995523877959.png',
-         'bitmap-64bitMD5_2181381724594493116.png'])
+         'bitmap-64bitMD5_15939355025996362179.png',
+         'bitmap-64bitMD5_649771916797529222.png',
+         'bitmap-64bitMD5_8132820002266077288.png',
+         'bitmap-64bitMD5_2406160701181324581.png'])
     self._assert_directory_contents(
         os.path.join(write_path_dir, 'green_skp'),
         ['bitmap-64bitMD5_12587324416545178013.png',
          'bitmap-64bitMD5_7624374914829746293.png',
-         'bitmap-64bitMD5_5686489729535631913.png',
-         'bitmap-64bitMD5_7980646035555096146.png',
-         'bitmap-64bitMD5_17817086664365875131.png',
-         'bitmap-64bitMD5_10673669813016809363.png'])
+         'bitmap-64bitMD5_11866144860997809880.png',
+         'bitmap-64bitMD5_3893392565127823822.png',
+         'bitmap-64bitMD5_2083084978343901738.png',
+         'bitmap-64bitMD5_89620927366502076.png'])
 
   def _run_render_pictures(self, args):
     binary = find_run_binary.find_path_to_program('render_pictures')
     return find_run_binary.run_command(
         [binary, '--config', '8888'] + args)
 
   def _create_expectations(self, missing_some_images=False,
                            ignore_some_failures=False,
                            rel_path='expectations.json'):
     """Creates expectations JSON file within self._expectations_dir .
@@ skipping 101 matching lines @@
     self.assertMultiLineEqual(prettyprinted_expected_dict,
                               prettyprinted_json_dict)
 
 
 def main():
   base_unittest.main(RenderPicturesTest)
 
 
 if __name__ == '__main__':
   main()