diff options
| author | Mike Hommey <glandium@debian.org> | 2005-03-27 13:24:21 +0000 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2005-03-27 13:24:21 +0000 |
| commit | cfd3eb4c168d5cd77d49727457f52005e9078811 (patch) | |
| tree | 3febeb7a825a3da03ca988cb31a9b0269fa61027 /xstc | |
| parent | 380148aab374b5f31a9e6873b67dfe983381c49b (diff) | |
| parent | 50e5b428562964b1eb2f876370058b34b47c5e90 (diff) | |
| download | libxml2-cfd3eb4c168d5cd77d49727457f52005e9078811.tar.gz | |
New upstream release
Diffstat (limited to 'xstc')
| -rw-r--r-- | xstc/Makefile.am | 14 | ||||
| -rw-r--r-- | xstc/Makefile.in | 16 |
2 files changed, 21 insertions, 9 deletions
diff --git a/xstc/Makefile.am b/xstc/Makefile.am index 45309ff..e7e128b 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: @@ -88,7 +94,7 @@ tests: valgrind: -@(if [ -x $(PYTHON) ] ; then \ echo '## Running the regression tests under Valgrind' ; \ - $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi); + $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi); clean: rm -f $(PYSCRIPTS) test.log diff --git a/xstc/Makefile.in b/xstc/Makefile.in index fd1733a..f2c9d44 100644 --- a/xstc/Makefile.in +++ b/xstc/Makefile.in @@ -125,7 +125,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PATTERN_TEST = @PATTERN_TEST@ PERL = @PERL@ PYTHON = @PYTHON@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ @@ -148,6 +147,7 @@ TEST_CATALOG = @TEST_CATALOG@ TEST_DEBUG = @TEST_DEBUG@ TEST_HTML = @TEST_HTML@ TEST_MODULES = @TEST_MODULES@ +TEST_PATTERN = @TEST_PATTERN@ TEST_PHTML = @TEST_PHTML@ TEST_PUSH = @TEST_PUSH@ TEST_REGEXPS = @TEST_REGEXPS@ @@ -479,18 +479,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: @@ -503,7 +509,7 @@ tests: valgrind: -@(if [ -x $(PYTHON) ] ; then \ echo '## Running the regression tests under Valgrind' ; \ - $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi); + $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi); clean: rm -f $(PYSCRIPTS) test.log |