xserver: Branch 'master'

[Adam Jackson]

 test/scripts/xinit-piglit-session.sh |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7a5ddf8da5ed817aa2dd6f7af1b9197a5ceec60b
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Sep 28 15:27:20 2016 -0400

    test: Re-enable a couple of GetImage tests
    
    Fixed in 6c6f09aac.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/test/scripts/xinit-piglit-session.sh b/test/scripts/xinit-piglit-session.sh
index 0f0c794..c26735d 100755
--- a/test/scripts/xinit-piglit-session.sh
+++ b/test/scripts/xinit-piglit-session.sh
@@ -40,8 +40,5 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xlistfontswithinfo at 4"
 PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont at 1"
 PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 1"
 PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont at 2"
-#    "REPORT: Incorrect pixel on inside of area at point (0, 0): 0x0 != 0x1"
-PIGLIT_ARGS="$PIGLIT_ARGS -x xgetimage at 7"
-PIGLIT_ARGS="$PIGLIT_ARGS -x xgetsubimage at 7"
 
 exec ./piglit-run.py xts-render -f $PIGLITCONF $PIGLIT_ARGS $PIGLIT_RESULTS_DIR