mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-01 16:07:04 -08:00
Gilles Dartiguelongue
96b2498a5a
Security bugs: #560524, #564240 and #564776. Also fix incorrect lzma support, bug #530386 and fix handling of documentation and examples with USE=python, bug #533324. https://bugs.gentoo.org/show_bug.cgi?id=530386 https://bugs.gentoo.org/show_bug.cgi?id=533324 https://bugs.gentoo.org/show_bug.cgi?id=560524 https://bugs.gentoo.org/show_bug.cgi?id=564240 https://bugs.gentoo.org/show_bug.cgi?id=564776 Package-Manager: portage-2.2.23
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
do not build test programs as we don't install them
|
|
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -10,7 +10,7 @@
|
|
|
|
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
|
|
|
|
-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
|
|
+check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
|
|
testThreads testC14N testAutomata testRegexp \
|
|
testReader testapi testModule runtest runsuite testchar \
|
|
testdict runxmlconf testrecurse testlimits
|
|
@@ -170,7 +170,7 @@
|
|
testModule_DEPENDENCIES = $(DEPS)
|
|
testModule_LDADD= $(LDADDS)
|
|
|
|
-noinst_LTLIBRARIES = testdso.la
|
|
+check_LTLIBRARIES = testdso.la
|
|
testdso_la_SOURCES = testdso.c
|
|
testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
|
|
|
|
@@ -202,7 +202,7 @@ runxmlconf_LDADD= $(LDADDS)
|
|
#testOOM_DEPENDENCIES = $(DEPS)
|
|
#testOOM_LDADD= $(LDADDS)
|
|
|
|
-runtests:
|
|
+runtests: check_PROGRAMS
|
|
[ -d test ] || $(LN_S) $(srcdir)/test .
|
|
[ -d result ] || $(LN_S) $(srcdir)/result .
|
|
$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
|
|
--- a/doc/examples/Makefile.am
|
|
+++ b/doc/examples/Makefile.am
|
|
@@ -13,7 +13,7 @@
|
|
rebuild: examples.xml index.html
|
|
.PHONY: rebuild
|
|
|
|
-examples.xml: index.py $(noinst_PROGRAMS:=.c)
|
|
+examples.xml: index.py $(check_PROGRAMS:=.c)
|
|
cd $(srcdir) && $(PYTHON) index.py
|
|
$(MAKE) Makefile
|
|
|
|
@@ -49,7 +49,7 @@
|
|
xpath1.res \
|
|
xpath2.res
|
|
|
|
-noinst_PROGRAMS = \
|
|
+check_PROGRAMS = \
|
|
io1 \
|
|
io2 \
|
|
parse1 \
|
|
@@ -99,7 +99,7 @@
|
|
valgrind:
|
|
$(MAKE) CHECKER='valgrind' tests
|
|
|
|
-tests: $(noinst_PROGRAMS)
|
|
+tests: $(check_PROGRAMS)
|
|
test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
|
|
@(echo '## examples regression tests')
|
|
@(echo > .memdump)
|
|
--- a/example/Makefile.am
|
|
+++ b/example/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-noinst_PROGRAMS = gjobread
|
|
+check_PROGRAMS = gjobread
|
|
|
|
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
|
|
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
|