Attachment 113860 Details for Bug 89354 – fix include order for AIX in test/

[patch] fix include order for AIX in test/

0001-test-fix-include-order-for-AIX-bug-89354.patch (text/plain), 16.83 KB, created by Michael Haubenwallner on 2015-02-27 09:36:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Haubenwallner

Created: 2015-02-27 09:36:39 UTC

Size: 16.83 KB

patch

obsolete

>From 19ef8a55dc98489ebc48fbaf30d3c3a5b8de9881 Mon Sep 17 00:00:00 2001
>From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
>Date: Thu, 26 Feb 2015 15:03:43 +0100
>Subject: [PATCH 1/4] test: fix include order for AIX, bug#89354
>
>---
> test/clip-nesting.c                            | 2 +-
> test/clip-operator.c                           | 2 +-
> test/close-path.c                              | 2 +-
> test/composite-integer-translate-over-repeat.c | 2 +-
> test/composite-integer-translate-over.c        | 2 +-
> test/composite-integer-translate-source.c      | 2 +-
> test/copy-path.c                               | 2 +-
> test/extend-pad-border.c                       | 2 +-
> test/extend-pad-similar.c                      | 2 +-
> test/extend-pad.c                              | 2 +-
> test/extend-reflect.c                          | 2 +-
> test/extended-blend.c                          | 2 +-
> test/mask.c                                    | 2 +-
> test/multi-page.c                              | 4 ++--
> test/operator-clear.c                          | 2 +-
> test/operator-source.c                         | 2 +-
> test/path-append.c                             | 2 +-
> test/pattern-getters.c                         | 2 +-
> test/pdf-features.c                            | 4 ++--
> test/pixman-downscale.c                        | 4 ++--
> test/pixman-rotate.c                           | 4 ++--
> test/ps-features.c                             | 4 ++--
> test/record-extend.c                           | 2 +-
> test/record-mesh.c                             | 2 +-
> test/select-font-no-show-text.c                | 2 +-
> test/self-copy.c                               | 2 +-
> test/source-clip-scale.c                       | 2 +-
> test/source-clip.c                             | 2 +-
> test/surface-pattern-scale-down.c              | 2 +-
> test/surface-pattern-scale-up.c                | 2 +-
> test/surface-pattern.c                         | 2 +-
> test/svg-clip.c                                | 3 ++-
> test/svg-surface.c                             | 3 ++-
> test/trap-clip.c                               | 2 +-
> test/unbounded-operator.c                      | 2 +-
> test/user-font-mask.c                          | 4 ++--
> test/user-font-proxy.c                         | 4 ++--
> test/user-font.c                               | 4 ++--
> test/xcb-snapshot-assert.c                     | 2 +-
> test/xlib-expose-event.c                       | 2 +-
> test/xlib-surface.c                            | 3 ++-
> 41 files changed, 52 insertions(+), 49 deletions(-)
>
>diff --git a/test/clip-nesting.c b/test/clip-nesting.c
>index ce03b4b..a9227ec 100644
>--- a/test/clip-nesting.c
>+++ b/test/clip-nesting.c
>@@ -23,8 +23,8 @@
>  * Author: Owen Taylor <otaylor@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 100
>diff --git a/test/clip-operator.c b/test/clip-operator.c
>index aaa3445..ac0a5e9 100644
>--- a/test/clip-operator.c
>+++ b/test/clip-operator.c
>@@ -23,8 +23,8 @@
>  * Author: Kristian HÃ¸gsberg <krh@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/close-path.c b/test/close-path.c
>index 41b237e..f1f1230 100644
>--- a/test/close-path.c
>+++ b/test/close-path.c
>@@ -23,8 +23,8 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>-#include <stdlib.h>
> #include "cairo-test.h"
>+#include <stdlib.h>
> 
> static cairo_test_draw_function_t draw;
> 
>diff --git a/test/composite-integer-translate-over-repeat.c b/test/composite-integer-translate-over-repeat.c
>index 9a60d9a..d9e0005 100644
>--- a/test/composite-integer-translate-over-repeat.c
>+++ b/test/composite-integer-translate-over-repeat.c
>@@ -24,8 +24,8 @@
>  * Author: Vladimir Vukicevic <vladimir@pobox.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 100
>diff --git a/test/composite-integer-translate-over.c b/test/composite-integer-translate-over.c
>index 8c6b9c2..4f89fa8 100644
>--- a/test/composite-integer-translate-over.c
>+++ b/test/composite-integer-translate-over.c
>@@ -22,8 +22,8 @@
>  *
>  * Author: Vladimir Vukicevic <vladimir@pobox.com>
>  */
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 100
>diff --git a/test/composite-integer-translate-source.c b/test/composite-integer-translate-source.c
>index a05133c..e6fd933 100644
>--- a/test/composite-integer-translate-source.c
>+++ b/test/composite-integer-translate-source.c
>@@ -24,8 +24,8 @@
>  * Author: Vladimir Vukicevic <vladimir@pobox.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 100
>diff --git a/test/copy-path.c b/test/copy-path.c
>index c5f9398..25823b6 100644
>--- a/test/copy-path.c
>+++ b/test/copy-path.c
>@@ -23,8 +23,8 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>-#include <stdlib.h>
> #include "cairo-test.h"
>+#include <stdlib.h>
> 
> static void
> scale_by_two (double *x, double *y)
>diff --git a/test/extend-pad-border.c b/test/extend-pad-border.c
>index de8105c..c02ec4f 100644
>--- a/test/extend-pad-border.c
>+++ b/test/extend-pad-border.c
>@@ -24,8 +24,8 @@
>  * Author: Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 90
>diff --git a/test/extend-pad-similar.c b/test/extend-pad-similar.c
>index 357252a..09a90f4 100644
>--- a/test/extend-pad-similar.c
>+++ b/test/extend-pad-similar.c
>@@ -24,8 +24,8 @@
>  * Author: Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 90
>diff --git a/test/extend-pad.c b/test/extend-pad.c
>index 15a2079..f851d44 100644
>--- a/test/extend-pad.c
>+++ b/test/extend-pad.c
>@@ -24,8 +24,8 @@
>  * Author: Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 90
>diff --git a/test/extend-reflect.c b/test/extend-reflect.c
>index 16b08c1..173befc 100644
>--- a/test/extend-reflect.c
>+++ b/test/extend-reflect.c
>@@ -1,5 +1,5 @@
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> static const char *png_filename = "romedalen.png";
>diff --git a/test/extended-blend.c b/test/extended-blend.c
>index a45ddc9..8edd182 100644
>--- a/test/extended-blend.c
>+++ b/test/extended-blend.c
>@@ -27,8 +27,8 @@
>  *          Emmanuel Pacaud <emmanuel.pacaud@lapp.in2p3.fr>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define STEPS 16
>diff --git a/test/mask.c b/test/mask.c
>index cc722d3..89f4c3c 100644
>--- a/test/mask.c
>+++ b/test/mask.c
>@@ -24,8 +24,8 @@
>  *          Kristian HÃ¸gsberg <krh@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/multi-page.c b/test/multi-page.c
>index e2c7ddf..a3102db 100644
>--- a/test/multi-page.c
>+++ b/test/multi-page.c
>@@ -23,6 +23,8 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> 
> #include <cairo.h>
>@@ -35,8 +37,6 @@
> #include <cairo-pdf.h>
> #endif
> 
>-#include "cairo-test.h"
>-
> /* The PostScript and PDF backends are now integrated into the main
>  * test suite, so we are getting good verification of most things
>  * there.
>diff --git a/test/operator-clear.c b/test/operator-clear.c
>index aac39f3..72a32c2 100644
>--- a/test/operator-clear.c
>+++ b/test/operator-clear.c
>@@ -24,8 +24,8 @@
>  *          Owen Taylor <otaylor@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/operator-source.c b/test/operator-source.c
>index 3dee570..9330a65 100644
>--- a/test/operator-source.c
>+++ b/test/operator-source.c
>@@ -25,8 +25,8 @@
>  *          Uli Schlachter <psychon@znc.in>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/path-append.c b/test/path-append.c
>index bcd282d..bdcc63a 100644
>--- a/test/path-append.c
>+++ b/test/path-append.c
>@@ -21,8 +21,8 @@
>  * OF THIS SOFTWARE.
>  */
> 
>-#include <stdlib.h>
> #include "cairo-test.h"
>+#include <stdlib.h>
> 
> static cairo_test_status_t
> draw (cairo_t *cr, int width, int height)
>diff --git a/test/pattern-getters.c b/test/pattern-getters.c
>index 28bc1f9..08508d7 100644
>--- a/test/pattern-getters.c
>+++ b/test/pattern-getters.c
>@@ -24,8 +24,8 @@
>  * Author: Vladimir Vukicevic <vladimir@pobox.com>
>  */
> 
>-#include <stdlib.h>
> #include "cairo-test.h"
>+#include <stdlib.h>
> 
> #define CHECK_SUCCESS do { \
>     if (status) { \
>diff --git a/test/pdf-features.c b/test/pdf-features.c
>index 0cc50ed..b9c2bd0 100644
>--- a/test/pdf-features.c
>+++ b/test/pdf-features.c
>@@ -23,12 +23,12 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> #include <cairo.h>
> #include <cairo-pdf.h>
> 
>-#include "cairo-test.h"
>-
> /* This test exists to test the various features of cairo-pdf.h.
>  *
>  * Currently, this test exercises the following function calls:
>diff --git a/test/pixman-downscale.c b/test/pixman-downscale.c
>index a57db02..6b653d2 100644
>--- a/test/pixman-downscale.c
>+++ b/test/pixman-downscale.c
>@@ -29,13 +29,13 @@
>  * Currently, this exercises several of pixman's scaling filters.
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> #include <stdlib.h>
> 
> #include <cairo.h>
> 
>-#include "cairo-test.h"
>-
> static const char png_filename[] = "quad-color.png";
> 
> /* Draw an image scaled down, with antialiasing disabled */
>diff --git a/test/pixman-rotate.c b/test/pixman-rotate.c
>index f412ce6..e0d0fc8 100644
>--- a/test/pixman-rotate.c
>+++ b/test/pixman-rotate.c
>@@ -24,6 +24,8 @@
>  * Author: Kristian HÃ¸gsberg <krh@redhat.com>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>@@ -31,8 +33,6 @@
> 
> #include <cairo.h>
> 
>-#include "cairo-test.h"
>-
> #define WIDTH	32
> #define HEIGHT	WIDTH
> 
>diff --git a/test/ps-features.c b/test/ps-features.c
>index fe5de42..d1abf91 100644
>--- a/test/ps-features.c
>+++ b/test/ps-features.c
>@@ -23,12 +23,12 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> #include <cairo.h>
> #include <cairo-ps.h>
> 
>-#include "cairo-test.h"
>-
> /* This test exists to test the various features of cairo-ps.h.
>  *
>  * Currently, this test exercises the following function calls:
>diff --git a/test/record-extend.c b/test/record-extend.c
>index 5ecef44..8e83871 100644
>--- a/test/record-extend.c
>+++ b/test/record-extend.c
>@@ -27,8 +27,8 @@
>  *	Chris Wilson <chris@chris-wilson.co.uk>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 90
>diff --git a/test/record-mesh.c b/test/record-mesh.c
>index 2581ce7..754a1d4 100644
>--- a/test/record-mesh.c
>+++ b/test/record-mesh.c
>@@ -29,8 +29,8 @@
>  *	Chris Wilson <chris@chris-wilson.co.uk>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define PAT_WIDTH  170
>diff --git a/test/select-font-no-show-text.c b/test/select-font-no-show-text.c
>index 0b72415..b2b4796 100644
>--- a/test/select-font-no-show-text.c
>+++ b/test/select-font-no-show-text.c
>@@ -38,8 +38,8 @@
>  *  Fixed... just a stray free().
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> 
> static cairo_test_status_t
> draw (cairo_t *cr, int width, int height)
>diff --git a/test/self-copy.c b/test/self-copy.c
>index 32a375a..bef02e9 100644
>--- a/test/self-copy.c
>+++ b/test/self-copy.c
>@@ -23,8 +23,8 @@
>  * Author: Owen Taylor <otaylor@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 40
>diff --git a/test/source-clip-scale.c b/test/source-clip-scale.c
>index 375f9be..4eca206 100644
>--- a/test/source-clip-scale.c
>+++ b/test/source-clip-scale.c
>@@ -23,8 +23,8 @@
>  * Author: Vladimir Vukicevic <vladimir@pobox.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 12
>diff --git a/test/source-clip.c b/test/source-clip.c
>index cbb2855..0c00070 100644
>--- a/test/source-clip.c
>+++ b/test/source-clip.c
>@@ -23,8 +23,8 @@
>  * Author: Owen Taylor <otaylor@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 12
>diff --git a/test/surface-pattern-scale-down.c b/test/surface-pattern-scale-down.c
>index 639019c..95782ef 100644
>--- a/test/surface-pattern-scale-down.c
>+++ b/test/surface-pattern-scale-down.c
>@@ -24,8 +24,8 @@
>  * Author: Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 200
>diff --git a/test/surface-pattern-scale-up.c b/test/surface-pattern-scale-up.c
>index 26e75c8..0d71ba1 100644
>--- a/test/surface-pattern-scale-up.c
>+++ b/test/surface-pattern-scale-up.c
>@@ -27,8 +27,8 @@
> /* Exhibits nasty behaviour with GS due as their /Interpolate implementation
>  * does not function for rotated images. */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 100
>diff --git a/test/surface-pattern.c b/test/surface-pattern.c
>index ff95475..725f68d 100644
>--- a/test/surface-pattern.c
>+++ b/test/surface-pattern.c
>@@ -24,8 +24,8 @@
>  * Author: Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define SIZE 140
>diff --git a/test/svg-clip.c b/test/svg-clip.c
>index b39e29f..dff65f7 100644
>--- a/test/svg-clip.c
>+++ b/test/svg-clip.c
>@@ -23,10 +23,11 @@
>  * Author: Kristian HÃ¸gsberg <krh@redhat.com>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> 
> #include <cairo-svg.h>
>-#include "cairo-test.h"
> 
> /* Test SVG clipping */
> 
>diff --git a/test/svg-surface.c b/test/svg-surface.c
>index 8ee3b61..13b006d 100644
>--- a/test/svg-surface.c
>+++ b/test/svg-surface.c
>@@ -23,10 +23,11 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> 
> #include <cairo-svg.h>
>-#include "cairo-test.h"
> 
> /* Pretty boring test just to make sure things aren't crashing ---
>  * no verification that we're getting good results yet.
>diff --git a/test/trap-clip.c b/test/trap-clip.c
>index acfcafc..f1a24ca 100644
>--- a/test/trap-clip.c
>+++ b/test/trap-clip.c
>@@ -23,8 +23,8 @@
>  * Author: Kristian HÃ¸gsberg <krh@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/unbounded-operator.c b/test/unbounded-operator.c
>index 6e132fb..ac1c50d 100644
>--- a/test/unbounded-operator.c
>+++ b/test/unbounded-operator.c
>@@ -24,8 +24,8 @@
>  *          Owen Taylor <otaylor@redhat.com>
>  */
> 
>-#include <math.h>
> #include "cairo-test.h"
>+#include <math.h>
> #include <stdio.h>
> 
> #define WIDTH 16
>diff --git a/test/user-font-mask.c b/test/user-font-mask.c
>index a6d394e..cf548e6 100644
>--- a/test/user-font-mask.c
>+++ b/test/user-font-mask.c
>@@ -26,11 +26,11 @@
>  *	Adrian Johnson <ajohnson@redneon.com>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdlib.h>
> #include <stdio.h>
> 
>-#include "cairo-test.h"
>-
> /*#define ROTATED 1*/
> 
> #define BORDER 10
>diff --git a/test/user-font-proxy.c b/test/user-font-proxy.c
>index 41a69e7..6a39d8e 100644
>--- a/test/user-font-proxy.c
>+++ b/test/user-font-proxy.c
>@@ -25,11 +25,11 @@
>  *	Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdlib.h>
> #include <stdio.h>
> 
>-#include "cairo-test.h"
>-
> /*#define ROTATED 1*/
> 
> #define BORDER 10
>diff --git a/test/user-font.c b/test/user-font.c
>index 30bc74e..435d561 100644
>--- a/test/user-font.c
>+++ b/test/user-font.c
>@@ -25,11 +25,11 @@
>  *	Behdad Esfahbod <behdad@behdad.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdlib.h>
> #include <stdio.h>
> 
>-#include "cairo-test.h"
>-
> /*#define ROTATED 1*/
> 
> #define BORDER 10
>diff --git a/test/xcb-snapshot-assert.c b/test/xcb-snapshot-assert.c
>index a674476..b578f8c 100644
>--- a/test/xcb-snapshot-assert.c
>+++ b/test/xcb-snapshot-assert.c
>@@ -24,8 +24,8 @@
>  * Author: Uli Schlachter <psychon@znc.in>
>  */
> 
>-#include "cairo.h"
> #include "cairo-test.h"
>+#include "cairo.h"
> 
> static cairo_surface_t *
> create_image (int width, int height)
>diff --git a/test/xlib-expose-event.c b/test/xlib-expose-event.c
>index 4b1cb46..1de23e0 100644
>--- a/test/xlib-expose-event.c
>+++ b/test/xlib-expose-event.c
>@@ -31,12 +31,12 @@
>  * made the same mistake again, it is worth adding a regression test...
>  */
> 
>+#include "cairo-test.h"
> 
> #include <stdio.h>
> #include <stdlib.h>
> 
> #include "cairo.h"
>-#include "cairo-test.h"
> 
> #include "buffer-diff.h"
> 
>diff --git a/test/xlib-surface.c b/test/xlib-surface.c
>index 4edc44b..137b282 100644
>--- a/test/xlib-surface.c
>+++ b/test/xlib-surface.c
>@@ -23,12 +23,13 @@
>  * Author: Carl D. Worth <cworth@cworth.org>
>  */
> 
>+#include "cairo-test.h"
>+
> #include <stdio.h>
> #include <stdlib.h>
> 
> #include "cairo.h"
> #include "cairo-xlib.h"
>-#include "cairo-test.h"
> 
> #include "cairo-boilerplate-xlib.h"
> 
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 89354: 113860 | 113861 | 113862 | 113865 | 113866

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.