lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Code Activity

Build test programs only when needed

Browse Source 
Add test programs to 'check_PROGRAMS' instead of 'noinst_PROGRAMS'.

Fixes bug 760457.
This commit is contained in:
Nick Wellnhofer
2017-06-17 15:44:50 +02:00
parent b9b4b6b513
commit 988a5a3b6b
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS) 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 \ testThreads testC14N testAutomata testRegexp \
testReader testapi testModule runtest runsuite testchar \ testReader testapi testModule runtest runsuite testchar \
testdict runxmlconf testrecurse testlimits testdict runxmlconf testrecurse testlimits
@@ -202,7 +202,8 @@ runxmlconf_LDADD= $(LDADDS)
#testOOM_DEPENDENCIES = $(DEPS) #testOOM_DEPENDENCIES = $(DEPS)
#testOOM_LDADD= $(LDADDS) #testOOM_LDADD= $(LDADDS)
runtests: runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test . [ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result . [ -d result ] || $(LN_S) $(srcdir)/result .
$(CHECKER) ./runtest$(EXEEXT) && \ $(CHECKER) ./runtest$(EXEEXT) && \

6
doc/examples/Makefile.am
View File

@@ -13,7 +13,7 @@ if REBUILD_DOCS
rebuild: examples.xml index.html rebuild: examples.xml index.html
.PHONY: rebuild .PHONY: rebuild
examples.xml: index.py $(noinst_PROGRAMS:=.c) examples.xml: index.py $(check_PROGRAMS:=.c)
cd $(srcdir) && $(PYTHON) index.py cd $(srcdir) && $(PYTHON) index.py
$(MAKE) Makefile $(MAKE) Makefile
@@ -49,7 +49,7 @@ EXTRA_DIST = \
xpath1.res \ xpath1.res \
xpath2.res xpath2.res
noinst_PROGRAMS = \ check_PROGRAMS = \
io1 \ io1 \
io2 \ io2 \
parse1 \ parse1 \
@@ -99,7 +99,7 @@ xpath2_SOURCES = xpath2.c
valgrind: valgrind:
$(MAKE) CHECKER='valgrind' tests $(MAKE) CHECKER='valgrind' tests
tests: $(noinst_PROGRAMS) tests: $(check_PROGRAMS)
@test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml . @test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
@(echo '## examples regression tests') @(echo '## examples regression tests')
@(echo > .memdump) @(echo > .memdump)

10
doc/examples/index.py
View File

@@ -235,7 +235,7 @@ if REBUILD_DOCS
rebuild: examples.xml index.html rebuild: examples.xml index.html
.PHONY: rebuild .PHONY: rebuild
examples.xml: index.py $(noinst_PROGRAMS:=.c) examples.xml: index.py $(check_PROGRAMS:=.c)
cd $(srcdir) && $(PYTHON) index.py cd $(srcdir) && $(PYTHON) index.py
$(MAKE) Makefile $(MAKE) Makefile
@@ -259,14 +259,14 @@ clean-local:
for extra in extras: for extra in extras:
EXTRA_DIST = EXTRA_DIST + " \\\n\t" + extra EXTRA_DIST = EXTRA_DIST + " \\\n\t" + extra
Makefile = Makefile + "EXTRA_DIST =%s\n\n" % (EXTRA_DIST) Makefile = Makefile + "EXTRA_DIST =%s\n\n" % (EXTRA_DIST)
noinst_PROGRAMS="" check_PROGRAMS=""
for example in examples: for example in examples:
noinst_PROGRAMS = noinst_PROGRAMS + " \\\n\t" + example check_PROGRAMS = check_PROGRAMS + " \\\n\t" + example
Makefile = Makefile + "noinst_PROGRAMS =%s\n\n" % (noinst_PROGRAMS) Makefile = Makefile + "check_PROGRAMS =%s\n\n" % (check_PROGRAMS)
for example in examples: for example in examples:
Makefile = Makefile + "%s_SOURCES = %s.c\n\n" % (example, example) Makefile = Makefile + "%s_SOURCES = %s.c\n\n" % (example, example)
Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n" Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n"
Makefile = Makefile + "tests: $(noinst_PROGRAMS)\n" Makefile = Makefile + "tests: $(check_PROGRAMS)\n"
Makefile = Makefile + "\t@test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .\n" Makefile = Makefile + "\t@test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .\n"
Makefile = Makefile + "\t@(echo '## examples regression tests')\n" Makefile = Makefile + "\t@(echo '## examples regression tests')\n"
Makefile = Makefile + "\t@(echo > .memdump)\n" Makefile = Makefile + "\t@(echo > .memdump)\n"

2
example/Makefile.am
View File

@@ -1,4 +1,4 @@
noinst_PROGRAMS = gjobread check_PROGRAMS = gjobread
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)

6
vms/build_libxml.com
View File

@@ -62,9 +62,9 @@ $!
$ bin_progs = "xmllint xmlcatalog" $ bin_progs = "xmllint xmlcatalog"
$! $!
$!- list of test modules to compile and link. Compare this list to the $!- list of test modules to compile and link. Compare this list to the
$! definition of noinst_PROGRAMS in MAKEFILE. $! definition of check_PROGRAMS in MAKEFILE.
$! $!
$ noinst_PROGRAMS = "testSchemas testRelax testSAX testHTML testXPath testURI " - $ check_PROGRAMS = "testSchemas testRelax testSAX testHTML testXPath testURI " -
+ "testThreads testC14N testAutomata testRegexp testReader" + "testThreads testC14N testAutomata testRegexp testReader"
$! $!
$!- set up build logicals -----------------------------------------------------\ $!- set up build logicals -----------------------------------------------------\
@@ -196,7 +196,7 @@ $ write sys$output "Building main programs and test programs"
$ write sys$output "" $ write sys$output ""
$! $!
$ p_no = 0 $ p_no = 0
$ all_progs = bin_progs + " " + noinst_PROGRAMS $ all_progs = bin_progs + " " + check_PROGRAMS
$ all_progs = f$edit(all_progs,"COMPRESS") $ all_progs = f$edit(all_progs,"COMPRESS")
$! $!
$ prog_loop: $ prog_loop: