[cairo-commit] 2 commits - src/win32 test/Makefile.am

[Chris Wilson]

 src/win32/cairo-win32-display-surface.c |   11 ++++++-----
 test/Makefile.am                        |   16 +++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 60549f7a56d2b021ab612a6b66e720d31f3400ad
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 23 13:03:27 2012 +0000

    win32: Copy back the fallback damage to the right location
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/win32/cairo-win32-display-surface.c b/src/win32/cairo-win32-display-surface.c
index a66a23e..6123f7e 100644
--- a/src/win32/cairo-win32-display-surface.c
+++ b/src/win32/cairo-win32-display-surface.c
@@ -546,7 +546,7 @@ _cairo_win32_display_surface_flush (void *abstract_surface)
 			     rect.x, rect.y,
 			     rect.width, rect.height,
 			     fallback->win32.dc,
-			     0, 0,
+			     rect.x, rect.y,
 			     SRCCOPY)) {
 		    status = _cairo_win32_print_gdi_error (__FUNCTION__);
 		    break;
@@ -566,7 +566,8 @@ static cairo_status_t
 _cairo_win32_display_surface_mark_dirty (void *abstract_surface,
 					 int x, int y, int width, int height)
 {
-    _cairo_win32_display_surface_discard_fallback (abstract_surface);
+    cairo_win32_display_surface_t *surface = abstract_surface;
+    assert (surface->fallback == NULL);
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -740,10 +741,10 @@ _cairo_win32_display_surface_unset_clip (cairo_win32_display_surface_t *surface)
 void
 _cairo_win32_display_surface_discard_fallback (cairo_win32_display_surface_t *surface)
 {
-    TRACE ((stderr, "%s (surface=%d)\n",
-	    __FUNCTION__, surface->win32.base.unique_id));
-
     if (surface->fallback) {
+	TRACE ((stderr, "%s (surface=%d)\n",
+		__FUNCTION__, surface->win32.base.unique_id));
+
 	cairo_surface_destroy (surface->fallback);
 	surface->fallback = NULL;
     }
commit c5b8cfab87754a0b7b41a257fdaa1b0776537cf8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 23 12:26:12 2012 +0000

    test: Tweak the results summary
    
    Fix up the rules for the new directory structure.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index 9682ff2..07826ff 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -231,21 +231,22 @@ user-data
 # A target to summarise the failures
 check-summary:
 	@FAILED_TESTS=""; \
-	for t in $(test_sources:.c=.log); do \
+	for t in output/*.log; do \
 	    if grep -e '\<FAIL\>' $$t >/dev/null 2>&1; then \
-		FAILED_TESTS="$$FAILED_TESTS $${t%.log}"; \
+		FAILED_TESTS="$$FAILED_TESTS $$t"; \
 	    fi; \
 	done; \
 	if test -n "$$FAILED_TESTS"; then \
 	    echo "Failed tests:"; \
 	    surfaces=""; \
 	    for t in $$FAILED_TESTS; do \
-		echo -n "     $$t: "; \
-		grep -e '\<FAIL\>' $$t.log | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq | tr '\n' ' '; \
+	    	name="$${t##output/}"; name="$${name%.log}"; \
+		echo -n "     $$name: "; \
+		grep -e '\<FAIL\>' $$t | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq | tr '\n' ' '; \
 		echo; \
-		for s in `grep -e '\<FAIL\>' $$t.log | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq`; do \
+		for s in `grep -e '\<FAIL\>' $$t | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq`; do \
 		    ss=`echo $$s | tr '-' '_'`; \
-		    tt=`echo $$t | tr '-' '_'`; \
+		    tt=`echo $$name | tr '-' '_'`; \
 		    eval $$ss=\""$${!ss} $$tt"\"; \
 		    echo $$surfaces | grep $$ss >/dev/null || surfaces="$$surfaces $$ss"; \
 		done; \
@@ -454,7 +455,8 @@ results.tar:
 	for i in output/*.fail.png ; do \
 		testname=$${i#output/} ; \
 		testname=$${testname%%.*} ; \
-		tar uf $@ $${testname}*.ref.png $${i%fail.png}out.png $${i%fail.png}diff.png ; \
+		echo tar uf $@ reference/$${testname}*.ref.png $${i%fail.png}out.png $${i%fail.png}diff.png ; \
+		tar uf $@ reference/$${testname}*.ref.png $${i%fail.png}out.png $${i%fail.png}diff.png ; \
 	done
 
 results.tar.gz: results.tar