pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/lowlevel-blt-bench.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 24e83cae64eaa238a7bf67488917b0f8cac89114
Author: Ben Avison <bavison at riscosopen.org>
Date:   Sat Jan 19 16:36:22 2013 +0000

    Tweaks to lowlevel-blt-bench
    
    This adds two extra tests, src_n_8 and src_8_8, which I have been
    using to benchmark my ARMv6 changes.
    
    I'd also like to propose that it requires an exact test name as the
    executable's argument, as achieved by this strstr to strcmp change.
    Without this, it is impossible to only benchmark (for example)
    add_8_8, add_n_8 or src_n_8, due to those also being substrings of
    many other test names.

diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
index 2f97b7b..7336fa0 100644
--- a/test/lowlevel-blt-bench.c
+++ b/test/lowlevel-blt-bench.c
@@ -630,6 +630,8 @@ tests_tbl[] =
     { "src_0565_0565",         PIXMAN_r5g6b5,      0, PIXMAN_OP_SRC,     PIXMAN_null,     0, PIXMAN_r5g6b5 },
     { "src_1555_0565",         PIXMAN_a1r5g5b5,    0, PIXMAN_OP_SRC,     PIXMAN_null,     0, PIXMAN_r5g6b5 },
     { "src_0565_1555",         PIXMAN_r5g6b5,      0, PIXMAN_OP_SRC,     PIXMAN_null,     0, PIXMAN_a1r5g5b5 },
+    { "src_8_8",               PIXMAN_a8,          0, PIXMAN_OP_SRC,     PIXMAN_null,     0, PIXMAN_a8 },
+    { "src_n_8",               PIXMAN_a8,          1, PIXMAN_OP_SRC,     PIXMAN_null,     0, PIXMAN_a8 },
     { "src_n_8_0565",          PIXMAN_a8r8g8b8,    1, PIXMAN_OP_SRC,     PIXMAN_a8,       0, PIXMAN_r5g6b5 },
     { "src_n_8_1555",          PIXMAN_a8r8g8b8,    1, PIXMAN_OP_SRC,     PIXMAN_a8,       0, PIXMAN_a1r5g5b5 },
     { "src_n_8_4444",          PIXMAN_a8r8g8b8,    1, PIXMAN_OP_SRC,     PIXMAN_a8,       0, PIXMAN_a4r4g4b4 },
@@ -772,7 +774,7 @@ main (int argc, char *argv[])
 
     for (i = 0; i < ARRAY_LENGTH (tests_tbl); i++)
     {
-	if (strcmp (pattern, "all") == 0 || strstr (tests_tbl[i].testname, pattern))
+	if (strcmp (pattern, "all") == 0 || strcmp (tests_tbl[i].testname, pattern) == 0)
 	{
 	    bench_composite (tests_tbl[i].testname,
 			     tests_tbl[i].src_fmt,