pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 Makefile.am      |    2 +-
 RELEASING        |    1 -
 test/Makefile.am |   14 ++++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit c6c43c65f76aa84c57a94155117487199bc0323e
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed Dec 16 15:23:50 2009 -0500

    Add 'check' to release-check make target

diff --git a/Makefile.am b/Makefile.am
index 63b08c1..9fd3a37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,7 @@ ensure-prev:
 		false;									\
 	fi
 
-release-check: ensure-prev release-verify-newer release-remove-old distcheck
+release-check: ensure-prev release-verify-newer release-remove-old check distcheck
 
 release-tag:
 	git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
diff --git a/RELEASING b/RELEASING
index e3e4214..66b9554 100644
--- a/RELEASING
+++ b/RELEASING
@@ -48,7 +48,6 @@ Here are the steps to follow to create a new pixman release:
 
 	xorg-announce at lists.freedesktop.org
 
-
 7) Increment pixman_micro to the next larger (odd) number in
    configure.ac. Commit this change, and push all commits created
    during this process using
commit b3afacf9c970fa7de5ffdebebbd8526a55d3e7d8
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed Dec 16 15:15:17 2009 -0500

    Reorder tests so that they fastest ones run first.

diff --git a/test/Makefile.am b/test/Makefile.am
index e892b51..ab98756 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman
 
 TESTPROGRAMS =			\
 	region-test		\
-	scaling-test		\
-	blitters-test		\
-	composite		\
 	fetch-test		\
 	oob-test		\
 	window-test		\
-	trap-crasher
+	trap-crasher		\
+	blitters-test		\
+	scaling-test		\
+	composite
 
 fetch_test_LDADD = $(TEST_LDADD)
 region_test_LDADD = $(TEST_LDADD)
@@ -69,7 +69,7 @@ convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
 
 endif
 
-check_PROGRAMS = $(TESTPROGRAMS) $(TESTPROGRAMS_GTK)
+noinst_PROGRAMS = $(TESTPROGRAMS) $(TESTPROGRAMS_GTK)
 
 TESTS = $(TESTPROGRAMS)
 
commit bbc5108bf8cfcb1f2334e51a8e904b5be48376e1
Author: Marvin Schmidt <marv at exherbo.org>
Date:   Sun Nov 15 16:04:09 2009 +0100

    Build tests and run non-GTK+ ones on `make check`
    
    Setting TESTS will run the tests on `make check`
    
    Bug 25131

diff --git a/test/Makefile.am b/test/Makefile.am
index 89d32e9..e892b51 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@ if HAVE_GTK
 GTK_LDADD = $(TEST_LDADD) $(GTK_LIBS)
 GTK_UTILS = gtk-utils.c gtk-utils.h
 
-TESTPROGRAMS +=			\
+TESTPROGRAMS_GTK =		\
 	clip-test		\
 	clip-in			\
 	composite-test		\
@@ -69,5 +69,7 @@ convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
 
 endif
 
-noinst_PROGRAMS = $(TESTPROGRAMS)
+check_PROGRAMS = $(TESTPROGRAMS) $(TESTPROGRAMS_GTK)
+
+TESTS = $(TESTPROGRAMS)