From 38e661c7d82fa0b34fbe9b3f3261295787bb6427 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 11 Jan 2012 08:18:52 +0100
Subject: mesa pixman xserver git update 11 jan 2012

---
 pixman/test/blitters-test.c        | 4 ++--
 pixman/test/composite-traps-test.c | 2 +-
 pixman/test/region-contains-test.c | 4 ++--
 pixman/test/stress-test.c          | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pixman/test')

diff --git a/pixman/test/blitters-test.c b/pixman/test/blitters-test.c
index 55b6c735c..feea308c2 100644
--- a/pixman/test/blitters-test.c
+++ b/pixman/test/blitters-test.c
@@ -103,7 +103,7 @@ free_random_image (uint32_t initcrc,
 		mask <<= (PIXMAN_FORMAT_BPP (fmt) - PIXMAN_FORMAT_DEPTH (fmt));
 	    }
 
-	    for (i = 0; i < 32; i++)
+	    for (i = 0; i * PIXMAN_FORMAT_BPP (fmt) < 32; i++)
 		mask |= mask << (i * PIXMAN_FORMAT_BPP (fmt));
 
 	    for (i = 0; i < stride * height / 4; i++)
@@ -424,6 +424,6 @@ main (int argc, const char *argv[])
     }
 
     return fuzzer_test_main("blitters", 2000000,
-			    0x29137844,
+			    0xA364B5BF,
 			    test_composite, argc, argv);
 }
diff --git a/pixman/test/composite-traps-test.c b/pixman/test/composite-traps-test.c
index ff03b50d9..de518d820 100644
--- a/pixman/test/composite-traps-test.c
+++ b/pixman/test/composite-traps-test.c
@@ -251,6 +251,6 @@ test_composite (int      testnum,
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main("composite traps", 40000, 0xE3112106,
+    return fuzzer_test_main("composite traps", 40000, 0x4346479C,
 			    test_composite, argc, argv);
 }
diff --git a/pixman/test/region-contains-test.c b/pixman/test/region-contains-test.c
index 2372686fc..9524e2888 100644
--- a/pixman/test/region-contains-test.c
+++ b/pixman/test/region-contains-test.c
@@ -73,7 +73,7 @@ random_coord (pixman_region32_t *region, pixman_bool_t x)
     case 3:
 	return begin;
     default:
-	return (begin + end) / 2;
+	return (end - begin) / 2 + begin;
     }
     return 0;
 }
@@ -163,7 +163,7 @@ main (int argc, const char *argv[])
 {
     return fuzzer_test_main ("region_contains",
 			     1000000,
-			     0xD7C297CC,
+			     0xD2BF8C73,
 			     test_region_contains_rectangle,
 			     argc, argv);
 }
diff --git a/pixman/test/stress-test.c b/pixman/test/stress-test.c
index 08bf1d4df..3174621e6 100644
--- a/pixman/test/stress-test.c
+++ b/pixman/test/stress-test.c
@@ -166,7 +166,8 @@ fake_reader (const void *src, int size)
     uint32_t r = lcg_rand_u32 ();
 
     assert (size == 1 || size == 2 || size == 4);
-    return r & ((1 << (size * 8)) - 1);
+
+    return r >> (32 - (size * 8));
 }
 
 static void
-- 
cgit v1.2.3