aboutsummaryrefslogtreecommitdiff
path: root/pixman/test
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 08:40:57 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 08:40:57 +0200
commit0470a59df89ab453bdbe0fc2f820278cfffdc61c (patch)
tree5482d527c8426219414edc60d3891764ca2b1a20 /pixman/test
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.tar.gz
vcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.tar.bz2
vcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.zip
libX11 libxtrans mesa git update 20 sep 2011
Diffstat (limited to 'pixman/test')
-rw-r--r--pixman/test/Makefile.am2
-rw-r--r--pixman/test/region-contains-test.c15
2 files changed, 9 insertions, 8 deletions
diff --git a/pixman/test/Makefile.am b/pixman/test/Makefile.am
index 4268cd7c5..802d3f4fc 100644
--- a/pixman/test/Makefile.am
+++ b/pixman/test/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/test/Makefile.sources
AM_CFLAGS = @OPENMP_CFLAGS@
AM_LDFLAGS = @OPENMP_CFLAGS@ @TESTPROGS_EXTRA_LDFLAGS@
-LDADD = $(top_builddir)/pixman/libpixman-1.la libutils.la -lm @PNG_LIBS@
+LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm @PNG_LIBS@
INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman @PNG_CFLAGS@
libutils_la_SOURCES = $(libutils_sources) $(libutils_headers)
diff --git a/pixman/test/region-contains-test.c b/pixman/test/region-contains-test.c
index d761c4bdf..b660fdf0b 100644
--- a/pixman/test/region-contains-test.c
+++ b/pixman/test/region-contains-test.c
@@ -13,14 +13,15 @@ make_random_region (pixman_region32_t *region)
n_boxes = lcg_rand_n (64);
while (n_boxes--)
{
- int32_t x1, y1, x2, y2;
+ int32_t x, y;
+ uint32_t w, h;
- x1 = (int32_t)lcg_rand_u32();
- y1 = (int32_t)lcg_rand_u32();
- x2 = (int32_t)lcg_rand_u32();
- y2 = (int32_t)lcg_rand_u32();
+ x = (int32_t)lcg_rand_u32() >> 2;
+ y = (int32_t)lcg_rand_u32() >> 2;
+ w = lcg_rand_u32() >> 2;
+ h = lcg_rand_u32() >> 2;
- pixman_region32_union_rect (region, region, x1, y1, x2, y2);
+ pixman_region32_union_rect (region, region, x, y, w, h);
}
}
@@ -163,7 +164,7 @@ main (int argc, const char *argv[])
{
return fuzzer_test_main ("region_contains",
1000000,
- 0x86311506,
+ 0xD7C297CC,
test_region_contains_rectangle,
argc, argv);
}