diff options
| author | William M. Brack <wbrack@src.gnome.org> | 2005-02-12 01:08:22 +0000 |
|---|---|---|
| committer | William M. Brack <wbrack@src.gnome.org> | 2005-02-12 01:08:22 +0000 |
| commit | a22da29921fc1f070084320428c2975e53acc184 (patch) | |
| tree | 67c28b2487f5b0e1c3a3f5ce0af8833f1341e5e6 /xstc | |
| parent | 3a1cd21df775a773ea6addb96377cef3ab39b615 (diff) | |
| download | libxml2-a22da29921fc1f070084320428c2975e53acc184.tar.gz | |
fixed xmlXIncludeParseFile to prevent overwriting XML_COMPLETE_ATTRS when
* xinclude.c: fixed xmlXIncludeParseFile to prevent
overwriting XML_COMPLETE_ATTRS when setting pctxt->loadsubset
(bug 166199)
* Makefile.am, python/tests/Makefile.am, xstc/Makefile.am: added
code to add $(top_builddir)/.libs to LD_LIBRARY_PATH whenever
PYTHONPATH is set, to assure new libxml2 routines are used.
Diffstat (limited to 'xstc')
| -rw-r--r-- | xstc/Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xstc/Makefile.am b/xstc/Makefile.am index 45309ff0..82de1ef6 100644 --- a/xstc/Makefile.am +++ b/xstc/Makefile.am @@ -64,18 +64,24 @@ $(TESTDIRS): pytests: $(PYSCRIPTS) $(TESTDIRS) -@(if [ -x nist-test.py -a -d nisttest ] ; then \ echo "## Running NIST Schemas tests"; \ - PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\ + 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 suntest ] ; then \ echo "## Running Sun Schemas tests"; \ - PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\ + 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 msxsdtest ] ; then \ echo "## Running Microsoft Schemas tests"; \ - PYTHONPATH="$$PYTHONPATH:../python:../python/.libs:..:../libs" ;\ + 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: |