[cairo-commit] test/Makefile.am

[M. Joonas Pihlaja]

 test/Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c7cf5317f58b382c47ad2d1b4d8db3133b0c4d4b
Author: M Joonas Pihlaja <jpihlaja at cc.helsinki.fi>
Date:   Wed Jun 24 23:33:44 2009 +0100

    [test] Fix Makefile.am for Solaris make.
    
    Sun's make doesn't like conditional assignments to variables
    in dependencies in the form of "target: VAR+=VAL".  This
    construct was used to force the test suite run in the foreground
    in the check-valgrind target.  It is replaced by a more
    explicit set of the CAIRO_TEST_MODE environment variable.

diff --git a/test/Makefile.am b/test/Makefile.am
index a2275a4..8df6c8e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1315,9 +1315,8 @@ run:
 	$(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_builddir)/libtool --mode=execute env $(TOOL)'
 
 # Check tests under valgrind.  Saves log to valgrind-log
-check-valgrind: MODE+=,foreground
 check-valgrind:
-	$(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_builddir)/libtool --mode=execute valgrind $(VALGRIND_FLAGS)' 2>&1 | tee valgrind-log
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) CAIRO_TEST_MODE="$(MODE),foreground" $(top_builddir)/libtool --mode=execute valgrind $(VALGRIND_FLAGS)' 2>&1 | tee valgrind-log
 
 %.log: %.c cairo-test-suite
 	-./cairo-test-suite $(<:.c=)