Merge pull request #4424 from nyalldawson/osx_tests

Add some mask images, adjust test results for OSX
qgis · Aug 6, 2017 · 794690822408552c57676570a9b38c10eb0a0129 · 7946908
2 parents 80d53e4 + ecafb49
commit 794690822408552c57676570a9b38c10eb0a0129
diff --git a/...ntrol_images/atlas/expected_atlas_autoscale1/expected_atlas_autoscale1_mask.png b/...ntrol_images/atlas/expected_atlas_autoscale1/expected_atlas_autoscale1_mask.png
diff --git a/...ntrol_images/atlas/expected_atlas_autoscale2/expected_atlas_autoscale2_mask.png b/...ntrol_images/atlas/expected_atlas_autoscale2/expected_atlas_autoscale2_mask.png
diff --git a/...ntrol_images/atlas/expected_atlas_filtering1/expected_atlas_filtering1_mask.png b/...ntrol_images/atlas/expected_atlas_filtering1/expected_atlas_filtering1_mask.png
diff --git a/...rol_images/atlas/expected_atlas_fixedscale1/expected_atlas_fixedscale1_mask.png b/...rol_images/atlas/expected_atlas_fixedscale1/expected_atlas_fixedscale1_mask.png
diff --git a/...rol_images/atlas/expected_atlas_fixedscale2/expected_atlas_fixedscale2_mask.png b/...rol_images/atlas/expected_atlas_fixedscale2/expected_atlas_fixedscale2_mask.png
diff --git a/...ata/control_images/atlas/expected_atlas_hiding1/expected_atlas_hiding1_mask.png b/...ata/control_images/atlas/expected_atlas_hiding1/expected_atlas_hiding1_mask.png
diff --git a/...ata/control_images/atlas/expected_atlas_hiding2/expected_atlas_hiding2_mask.png b/...ata/control_images/atlas/expected_atlas_hiding2/expected_atlas_hiding2_mask.png
diff --git a/...tlas/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1_mask.png b/...tlas/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1_mask.png
diff --git a/...tlas/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2_mask.png b/...tlas/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2_mask.png
diff --git a/...a/control_images/atlas/expected_atlas_sorting2/expected_atlas_sorting2_mask.png b/...a/control_images/atlas/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
diff --git a/...control_images/atlas/expected_atlas_two_maps1/expected_atlas_two_maps1_mask.png b/...control_images/atlas/expected_atlas_two_maps1/expected_atlas_two_maps1_mask.png
diff --git a/...control_images/atlas/expected_atlas_two_maps2/expected_atlas_two_maps2_mask.png b/...control_images/atlas/expected_atlas_two_maps2/expected_atlas_two_maps2_mask.png
diff --git a/..._items/expected_composerrotation_label/expected_composerrotation_label_mask.png b/..._items/expected_composerrotation_label/expected_composerrotation_label_mask.png
diff --git a/...oser_label/expected_composerlabel_render/expected_composerlabel_render_mask.png b/...oser_label/expected_composerlabel_render/expected_composerlabel_render_mask.png
diff --git a/...nd/expected_composer_legend_mapunits/expected_composer_legend_mapunits_mask.png b/...nd/expected_composer_legend_mapunits/expected_composer_legend_mapunits_mask.png
diff --git a/...d_composer_legend_noresize_crop/expected_composer_legend_noresize_crop_mask.png b/...d_composer_legend_noresize_crop/expected_composer_legend_noresize_crop_mask.png
diff --git a/...ted_composer_legend_size_content/expected_composer_legend_size_content_mask.png b/...ted_composer_legend_size_content/expected_composer_legend_size_content_mask.png
diff --git a/...mposermap_filteredannotations/expected_composermap_filteredannotations_mask.png b/...mposermap_filteredannotations/expected_composermap_filteredannotations_mask.png
diff --git a/...composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png b/...composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png
diff --git a/...rticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png b/...rticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png
diff --git a/...icaldescending_outside/expected_composermap_verticaldescending_outside_mask.png b/...icaldescending_outside/expected_composermap_verticaldescending_outside_mask.png
diff --git a/...xpected_composerpicture_expression/expected_composerpicture_expression_mask.png b/...xpected_composerpicture_expression/expected_composerpicture_expression_mask.png
diff --git a/...oserpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage_mask.png b/...oserpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage_mask.png
diff --git a/...xpected_composerpicture_svg_params/expected_composerpicture_svg_params_mask.png b/...xpected_composerpicture_svg_params/expected_composerpicture_svg_params_mask.png
diff --git a/...ected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch_mask.png b/...ected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch_mask.png
diff --git a/...re/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom_mask.png b/...re/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom_mask.png
diff --git a/...composerpicture_svg_zoomresize/expected_composerpicture_svg_zoomresize_mask.png b/...composerpicture_svg_zoomresize/expected_composerpicture_svg_zoomresize_mask.png
diff --git a/...xpected_composerscalebar_doublebox/expected_composerscalebar_doublebox_mask.png b/...xpected_composerscalebar_doublebox/expected_composerscalebar_doublebox_mask.png
diff --git a/...xpected_composerscalebar_singlebox/expected_composerscalebar_singlebox_mask.png b/...xpected_composerscalebar_singlebox/expected_composerscalebar_singlebox_mask.png
diff --git a/...oserscalebar_singlebox_alpha/expected_composerscalebar_singlebox_alpha_mask.png b/...oserscalebar_singlebox_alpha/expected_composerscalebar_singlebox_alpha_mask.png
diff --git a/...scalebar/expected_composerscalebar_tick/expected_composerscalebar_tick_mask.png b/...scalebar/expected_composerscalebar_tick/expected_composerscalebar_tick_mask.png
diff --git a/...ted_composerattributetable_align/expected_composerattributetable_align_mask.png b/...ted_composerattributetable_align/expected_composerattributetable_align_mask.png
diff --git a/...mposerattributetable_autowrap/expected_composerattributetable_autowrap_mask.png b/...mposerattributetable_autowrap/expected_composerattributetable_autowrap_mask.png
diff --git a/...oserattributetable_cellstyle/expected_composerattributetable_cellstyle_mask.png b/...oserattributetable_cellstyle/expected_composerattributetable_cellstyle_mask.png
diff --git a/...attributetable_columnwidth/expected_composerattributetable_columnwidth_mask.png b/...attributetable_columnwidth/expected_composerattributetable_columnwidth_mask.png
diff --git a/...oserattributetable_drawempty/expected_composerattributetable_drawempty_mask.png b/...oserattributetable_drawempty/expected_composerattributetable_drawempty_mask.png
diff --git a/...attributetable_headersonly/expected_composerattributetable_headersonly_mask.png b/...attributetable_headersonly/expected_composerattributetable_headersonly_mask.png
diff --git a/...utetable_horizontalgrid/expected_composerattributetable_horizontalgrid_mask.png b/...utetable_horizontalgrid/expected_composerattributetable_horizontalgrid_mask.png
diff --git a/...oserattributetable_multiline/expected_composerattributetable_multiline_mask.png b/...oserattributetable_multiline/expected_composerattributetable_multiline_mask.png
diff --git a/...d_composerattributetable_render/expected_composerattributetable_render_mask.png b/...d_composerattributetable_render/expected_composerattributetable_render_mask.png
diff --git a/...attributetable_showmessage/expected_composerattributetable_showmessage_mask.png b/...attributetable_showmessage/expected_composerattributetable_showmessage_mask.png
diff --git a/...tributetable_verticalgrid/expected_composerattributetable_verticalgrid_mask.png b/...tributetable_verticalgrid/expected_composerattributetable_verticalgrid_mask.png
diff --git a/tests/testdata/control_images/expected_atlas_legend/expected_atlas_legend_mask.png b/tests/testdata/control_images/expected_atlas_legend/expected_atlas_legend_mask.png
diff --git a/...labelingengine/expected_label_order_layer1/expected_label_order_layer1_mask.png b/...labelingengine/expected_label_order_layer1/expected_label_order_layer1_mask.png
diff --git a/...ges/labelingengine/expected_label_order_size/expected_label_order_size_mask.png b/...ges/labelingengine/expected_label_order_size/expected_label_order_size_mask.png
diff --git a/...labelingengine/expected_label_order_zindex/expected_label_order_zindex_mask.png b/...labelingengine/expected_label_order_zindex/expected_label_order_zindex_mask.png
diff --git a/..._images/labelingengine/expected_labeling_basic/expected_labeling_basic_mask.png b/..._images/labelingengine/expected_labeling_basic/expected_labeling_basic_mask.png
diff --git a/...labelingengine/expected_labeling_rulebased/expected_labeling_rulebased_mask.png b/...labelingengine/expected_labeling_rulebased/expected_labeling_rulebased_mask.png
diff --git a/...ta/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png b/...ta/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png
diff --git a/...ta/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png b/...ta/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png
diff --git a/...ta/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png b/...ta/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png
diff --git a/...ta/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png b/...ta/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png
diff --git a/...ta/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png b/...ta/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png
diff --git a/...ta/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png b/...ta/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png
diff --git a/...ta/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png b/...ta/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png
diff --git a/...ta/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png b/...ta/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png
diff --git a/...ta/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png b/...ta/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png
diff --git a/...data/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png b/...data/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png
diff --git a/...ol_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png b/...ol_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png
diff --git a/.../expected_legend_diagram_attributes/expected_legend_diagram_attributes_mask.png b/.../expected_legend_diagram_attributes/expected_legend_diagram_attributes_mask.png
diff --git a/...mages/legend/expected_legend_diagram_size/expected_legend_diagram_size_mask.png b/...mages/legend/expected_legend_diagram_size/expected_legend_diagram_size_mask.png
diff --git a/...ected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png b/...ected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png
diff --git a/...ges/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png b/...ges/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png
diff --git a/.../expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png b/.../expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png
diff --git a/...nd/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png b/...nd/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png
diff --git a/...mages/legend/expected_legend_line_spacing/expected_legend_line_spacing_mask.png b/...mages/legend/expected_legend_line_spacing/expected_legend_line_spacing_mask.png
diff --git a/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png b/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png
diff --git a/...ontrol_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png b/...ontrol_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png
diff --git a/...ges/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png b/...ges/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png
diff --git a/..._images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol_mask.png b/..._images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol_mask.png
diff --git a/...ges/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png b/...ges/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png
diff --git a/...images/mapcanvas/expected_map_magnification/expected_map_magnification_mask.png b/...images/mapcanvas/expected_map_magnification/expected_map_magnification_mask.png
diff --git a/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png b/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png
diff --git a/...bol_fontmarker/expected_fontmarker_outline/expected_fontmarker_outline_mask.png b/...bol_fontmarker/expected_fontmarker_outline/expected_fontmarker_outline_mask.png
diff --git a/.../testdata/control_images/text_renderer/text_point_bold/text_point_bold_mask.png b/.../testdata/control_images/text_renderer/text_point_bold/text_point_bold_mask.png
diff --git a/...ages/text_renderer/text_point_center_aligned/text_point_center_aligned_mask.png b/...ages/text_renderer/text_point_center_aligned/text_point_center_aligned_mask.png
diff --git a/...ext_point_center_multiline_aligned/text_point_center_multiline_aligned_mask.png b/...ext_point_center_multiline_aligned/text_point_center_multiline_aligned_mask.png
diff --git a/...control_images/text_renderer/text_point_multiline/text_point_multiline_mask.png b/...control_images/text_renderer/text_point_multiline/text_point_multiline_mask.png
diff --git a/...images/text_renderer/text_point_right_aligned/text_point_right_aligned_mask.png b/...images/text_renderer/text_point_right_aligned/text_point_right_aligned_mask.png