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

[Behdad Esfahbod]

 test/Makefile.am  |    2 +-
 test/cairo-test.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 83dcbe05b5bce6619e650d63be58a35fcb1609c1 (from 1cb0bc40a3ab9373d19c186d98059007f288fa13)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 5 04:29:54 2006 +0200

    For check-valgrind, call the version of libtool in our source distribution,
    not the one found in PATH.

diff --git a/test/Makefile.am b/test/Makefile.am
index ed18d56..4cdabcf 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -455,7 +455,7 @@ CLEANFILES =					\
 	index.html
 
 check-valgrind:
-	TESTS_ENVIRONMENT="libtool --mode=execute valgrind --tool=memcheck --suppressions=./.valgrind-suppressions --leak-check=yes --show-reachable=yes" $(MAKE) check 2>&1 | tee valgrind.log
+	TESTS_ENVIRONMENT="$(top_srcdir)/libtool --mode=execute valgrind --tool=memcheck --suppressions=./.valgrind-suppressions --leak-check=yes --show-reachable=yes" $(MAKE) check 2>&1 | tee valgrind.log
 
 html: index.html
 
diff-tree 1cb0bc40a3ab9373d19c186d98059007f288fa13 (from 91ad3ae78400d2d942354b8cde514480dffc5090)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 5 04:22:32 2006 +0200

    Do not use sighandler_t.  Bug 7401.

diff --git a/test/cairo-test.c b/test/cairo-test.c
index 38acd0d..158c14e 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -1635,7 +1635,7 @@ cairo_test_expecting (cairo_test_t *test
 {
     volatile int i, j, num_targets;
     const char *tname;
-    sighandler_t old_segfault_handler;
+    void (*old_segfault_handler)(int);
     cairo_test_status_t status, ret;
     cairo_test_target_t **targets_to_test;
     cairo_test_target_t targets[] =
@@ -1841,12 +1841,12 @@ cairo_test_expecting (cairo_test_t *test
 		    dev_offset);
 
 	    /* Set up a checkpoint to get back to in case of segfaults. */
-	    old_segfault_handler = signal (SIGSEGV, (sighandler_t) segfault_handler);
+	    old_segfault_handler = signal (SIGSEGV, segfault_handler);
 	    if (0 == setjmp (jmpbuf))
 		status = cairo_test_for_target (test, draw, target, dev_offset);
 	    else
 	        status = CAIRO_TEST_CRASHED;
-	    signal (SIGSEGV, (sighandler_t) old_segfault_handler);
+	    signal (SIGSEGV, old_segfault_handler);
 
 	    cairo_test_log ("TEST: %s TARGET: %s FORMAT: %s OFFSET: %d RESULT: ",
 			    test->name, target->name,