mattst88 14/12/12 21:50:18 Modified: cairo-1.12.18-disable-test-suite.patch Log: Disable the test suite better, bug 532338. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path 1.2 x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch?r1=1.1&r2=1.2 Index: cairo-1.12.18-disable-test-suite.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cairo-1.12.18-disable-test-suite.patch 9 Dec 2014 21:27:32 -0000 1.1 +++ cairo-1.12.18-disable-test-suite.patch 12 Dec 2014 21:50:18 -0000 1.2 @@ -1,13 +1,15 @@ -diff --git a/test/Makefile.am b/test/Makefile.am -index 950629b..db8cc90 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -75,7 +75,7 @@ endif - endif - test_sources += $(test) +diff --git a/Makefile.am b/Makefile.am +index 03fa352..7e11d24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} --noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build -+check_PROGRAMS = cairo-test-suite$(EXEEXT) # always build - noinst_SCRIPTS = check-refs.sh + DIST_SUBDIRS = src doc util boilerplate test perf + SUBDIRS = src doc util +-# libpng is required for our test programs +-if CAIRO_HAS_PNG_FUNCTIONS +-SUBDIRS += boilerplate test perf +-endif + + configure: cairo-version.h - TESTS += cairo-test-suite$(EXEEXT)
