mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-10-27 21:55:05 +03:00
5706b6d876
Makefile.am:
* Don't use @VAR@, use $(VAR). Autoconf's AC_SUBST provides us the Make
variable, it allows overriding the value at the command line, and
(notably) it avoids a Make parse error in the libxml2_la_LDFLAGS
assignment when @MODULE_PLATFORM_LIBS@ is empty
* Changed how the THREADS_W32 mechanism switches the build between
testThreads.c and testThreadsWin32.c as appropriate; using AM_CONDITIONAL
allows this to work cleanly and plays well with dependencies
* testapi.c should be specified as BUILT_SOURCES
* Create symlinks to the test/ and result/ subdirs so that the runtests
target is usable in out-of-source-tree builds
* Don't do MAKEFLAGS+=--silent as this is not portable to non-GNU Makes
* Fixed incorrect find(1) syntax in the "cleanup" rule, and doing "rm -f"
instead of just "rm" is good form
* (DIST)CLEANFILES needed a bit more coverage to allow "make distcheck" to
pass
configure.in:
* Need AC_PROG_LN_S to create test/ and result/ symlinks in Makefile.am
* AC_LIBTOOL_WIN32_DLL and AM_PROG_LIBTOOL are obsolete; these have been
superceded by LT_INIT
* Don't rebuild docs by default, as this requires GNU Make (as
implemented)
* Check for uint32_t as some platforms don't provide it
* Check for some more functions, and undefine HAVE_MMAP if we don't also
HAVE_MUNMAP (one system I tested on actually needed this)
* Changed THREADS_W32 from a filename insert into an Automake conditional
* The "Copyright" file will not be in the current directory if builddir !=
srcdir
doc/Makefile.am:
* EXTRA_DIST cannot use wildcards when they refer to generated files; this
breaks dependencies. What I did was define EXTRA_DIST_wc, which uses GNU
Make $(wildcard) directives to build up a list of files, and EXTRA_DIST,
as a literal expansion of EXTRA_DIST_wc. I also added a new rule,
"check-extra-dist", to simplify checking that the two variables are
equivalent. (Note that this works only when builddir == srcdir)
(I can implement this differently if desired; this is just one way of
doing it)
* Don't define an "all" target; this steps on Automake's toes
* Fixed up the "libxml2-api.xml ..." rule by using $(wildcard) for
dependencies (as Make doesn't process the wildcards otherwise) and
qualifying appropriate files with $(srcdir)
(Note that $(srcdir) is not needed in the dependencies, thanks to VPATH,
which we can count on as this is GNU-Make-only code anyway)
doc/devhelp/Makefile.am:
* Qualified appropriate files with $(srcdir)
* Added an "uninstall-local" rule so that "make distcheck" passes
doc/examples/Makefile.am:
* Rather than use a wildcard that doesn't work, use a substitution that
most Make programs can handle
doc/examples/index.py:
* Do the same here
include/libxml/nanoftp.h:
* Some platforms (e.g. MSVC 6) already #define INVALID_SOCKET:
user@host:/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/\
Include$ grep -R INVALID_SOCKET .
./WINSOCK.H:#define INVALID_SOCKET (SOCKET)(~0)
./WINSOCK2.H:#define INVALID_SOCKET (SOCKET)(~0)
include/libxml/xmlversion.h.in:
* Support ancient GCCs (I was actually able to build the library with 2.5
but for this bit)
python/Makefile.am:
* Expanded CLEANFILES to allow "make distcheck" to pass
python/tests/Makefile.am:
* Define CLEANFILES instead of a "clean" rule, and added tmp.xml to allow
"make distcheck" to pass
testRelax.c:
* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H (as some
systems have the header but not the function)
testSchemas.c:
* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H
testapi.c:
* Don't use putenv() if it's not available
threads.c:
* This fixes the following build error on Solaris 8:
libtool: compile: cc -DHAVE_CONFIG_H -I. -I./include -I./include \
-D_REENTRANT -D__EXTENSIONS__ -D_REENTRANT -Dsparc -Xa -mt -v \
-xarch=v9 -xcrossfile -xO5 -c threads.c -KPIC -DPIC -o threads.o
"threads.c", line 442: controlling expressions must have scalar type
"threads.c", line 512: controlling expressions must have scalar type
cc: acomp failed for threads.c
*** Error code 1
trio.c:
* Define isascii() if the system doesn't provide it
trio.h:
* The trio library's HAVE_CONFIG_H header is not the same as LibXML2's
HAVE_CONFIG_H header; this change is needed to avoid a double-inclusion
win32/configure.js:
* Added support for the LZMA compression option
win32/Makefile.{bcb,mingw,msvc}:
* Added appropriate bits to support WITH_LZMA=1
* Install the header files under $(INCPREFIX)\libxml2\libxml instead of
$(INCPREFIX)\libxml, to mirror the install location on Unix+Autotools
xml2-config.in:
* @MODULE_PLATFORM_LIBS@ (usually "-ldl") needs to be in there in order for
`xml2-config --libs` to provide a complete set of dependencies
xmllint.c:
* Use HAVE_MMAP instead of the less-explicit HAVE_SYS_MMAN_H
133 lines
5.0 KiB
Makefile
133 lines
5.0 KiB
Makefile
#
|
|
# Definition for the tests from W3C
|
|
#
|
|
PYSCRIPTS=nist-test.py ms-test.py sun-test.py
|
|
TESTDIR=Tests
|
|
TESTDIRS=$(TESTDIR)/msxsdtest $(TESTDIR)/suntest $(TESTDIR)/Datatypes
|
|
TARBALL=xsts-2002-01-16.tar.gz
|
|
TARBALL_2=xsts-2004-01-14.tar.gz
|
|
TSNAME=xmlschema2002-01-16
|
|
TSNAME_2=xmlschema2004-01-14
|
|
TARBALLURL=http://www.w3.org/XML/2004/xml-schema-test-suite/$(TSNAME)/$(TARBALL)
|
|
TARBALLURL_2=http://www.w3.org/XML/2004/xml-schema-test-suite/$(TSNAME_2)/$(TARBALL_2)
|
|
MSTESTDEF=MSXMLSchema1-0-20020116.testSet
|
|
SUNTESTDEF=SunXMLSchema1-0-20020116.testSet
|
|
NISTTESTDEF=NISTXMLSchema1-0-20020116.testSet
|
|
NISTTESTDEF_2=NISTXMLSchemaDatatypes.testSet
|
|
|
|
#
|
|
# The local data and scripts
|
|
#
|
|
EXTRA_DIST=xstc.py xstc-to-python.xsl
|
|
#
|
|
# Nothing is done by make, only make tests and
|
|
# only if Python and Schemas are enabled.
|
|
#
|
|
all:
|
|
|
|
#
|
|
# Rule to load the test description and extract the informations
|
|
#
|
|
$(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/Metadata/$(SUNTESTDEF):
|
|
-@(if [ ! -d Tests ] ; then \
|
|
mkdir Tests ; \
|
|
fi)
|
|
-@(if [ ! -f $(TARBALL_2) ] ; then \
|
|
if [ -f $(srcdir)/$(TARBALL_2) ] ; then \
|
|
$(LN_S) $(srcdir)/$(TARBALL_2) $(TARBALL_2) ; else \
|
|
echo "Missing the test suite description (2004-01-14), trying to fetch it" ;\
|
|
if [ -x "$(WGET)" ] ; then \
|
|
$(WGET) $(TARBALLURL_2) ; \
|
|
else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
|
|
-@(if [ -f $(TARBALL_2) ] ; then \
|
|
echo -n "extracting test data (NIST)..." ; \
|
|
$(TAR) -xzf $(TARBALL_2) --wildcards '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \
|
|
echo "done" ; \
|
|
fi)
|
|
-@(if [ ! -f $(TARBALL) ] ; then \
|
|
if [ -f $(srcdir)/$(TARBALL) ] ; then \
|
|
$(LN_S) $(srcdir)/$(TARBALL) $(TARBALL) ; else \
|
|
echo "Missing the test suite description (2002-01-16), trying to fetch it" ;\
|
|
if [ -x "$(WGET)" ] ; then \
|
|
$(WGET) $(TARBALLURL) ; \
|
|
else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
|
|
-@(if [ -f $(TARBALL) ] ; then \
|
|
echo -n "extracting test data (Sun, Microsoft)..." ; \
|
|
$(TAR) -C Tests -xzf $(TARBALL) --wildcards '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \
|
|
if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \
|
|
if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \
|
|
mv Tests/xmlschema2002-01-16/* Tests ; \
|
|
mv Tests/*.testSet Tests/Metadata ; \
|
|
rm -r Tests/xmlschema2002-01-16 ; \
|
|
echo "done" ; \
|
|
fi)
|
|
|
|
#
|
|
# The python tests are generated via XSLT
|
|
#
|
|
nist-test.py: Tests/Metadata/$(NISTTESTDEF_2) xstc-to-python.xsl
|
|
-@(if [ -x $(XSLTPROC) ] ; then \
|
|
echo "Rebuilding script (NIST)" $@ ; \
|
|
$(XSLTPROC) --nonet --stringparam vendor NIST-2 \
|
|
$(srcdir)/xstc-to-python.xsl \
|
|
$(srcdir)/Tests/Metadata/$(NISTTESTDEF_2) > $@ ; \
|
|
chmod +x $@ ; fi )
|
|
|
|
ms-test.py: Tests/Metadata/$(MSTTESTDEF) xstc-to-python.xsl
|
|
-@(if [ -x $(XSLTPROC) ] ; then \
|
|
echo "Rebuilding script (Microsoft)" $@ ; \
|
|
$(XSLTPROC) --nonet --stringparam vendor MS \
|
|
$(srcdir)/xstc-to-python.xsl \
|
|
$(srcdir)/Tests/Metadata/$(MSTESTDEF) > $@ ; \
|
|
chmod +x $@ ; fi )
|
|
|
|
sun-test.py: Tests/Metadata/$(SUNTESTDEF) xstc-to-python.xsl
|
|
-@(if [ -x $(XSLTPROC) ] ; then \
|
|
echo "Rebuilding script (Sun)" $@ ; \
|
|
$(XSLTPROC) --nonet --stringparam vendor SUN \
|
|
$(srcdir)/xstc-to-python.xsl \
|
|
$(srcdir)/Tests/Metadata/$(SUNTESTDEF) > $@ ; \
|
|
chmod +x $@ ; fi )
|
|
|
|
#
|
|
# The actual test run if present. PYTHONPATH is updated to make sure
|
|
# we run the version from the loacl build and not preinstalled bindings
|
|
#
|
|
pytests: $(PYSCRIPTS) $(TESTDIRS)
|
|
-@(if [ -x nist-test.py -a -d $(TESTDIR)/Datatypes ] ; then \
|
|
echo "## Running XML Schema tests (NIST)"; \
|
|
PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
|
|
export PYTHONPATH; \
|
|
LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
|
|
export LD_LIBRARY_PATH; \
|
|
$(CHECKER) $(PYTHON) nist-test.py -s -b $(srcdir) ; fi)
|
|
-@(if [ -x sun-test.py -a -d $(TESTDIR)/suntest ] ; then \
|
|
echo "## Running Schema tests (Sun)"; \
|
|
PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
|
|
export PYTHONPATH; \
|
|
LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
|
|
export LD_LIBRARY_PATH; \
|
|
$(CHECKER) $(PYTHON) sun-test.py -s -b $(srcdir) ; fi)
|
|
-@(if [ -x ms-test.py -a -d $(TESTDIR)/msxsdtest ] ; then \
|
|
echo "## Running Schema tests (Microsoft)"; \
|
|
PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\
|
|
export PYTHONPATH; \
|
|
LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
|
|
export LD_LIBRARY_PATH; \
|
|
$(CHECKER) $(PYTHON) ms-test.py -s -b $(srcdir) ; fi)
|
|
|
|
tests:
|
|
-@(if [ -x $(PYTHON) ] ; then \
|
|
$(MAKE) pytests ; fi);
|
|
|
|
#
|
|
# Heavy, works well only on RHEL3
|
|
#
|
|
valgrind:
|
|
-@(if [ -x $(PYTHON) ] ; then \
|
|
echo '## Running the regression tests under Valgrind' ; \
|
|
$(MAKE) CHECKER='valgrind -q' pytests ; fi);
|
|
|
|
CLEANFILES=$(PYSCRIPTS) test.log
|
|
|