starting to integrate the xstc suite in the normal regression tests Daniel

* Makefile.am configure.in xstc/.cvsignore xstc/Makefile.am:
  starting to integrate the xstc suite in the normal regression
  tests
Daniel

ChangeLog

+Mon Sep  6 13:56:28 CEST 2004 Daniel Veillard <daniel@veillard.com>
+
+	* Makefile.am configure.in xstc/.cvsignore xstc/Makefile.am:
+	  starting to integrate the xstc suite in the normal regression
+	  tests
+
 Mon Sep  6 13:14:11 CEST 2004 Kasimier Buchcik <libxml2-cvs@cazic.net>
 	* xstc/sun-test-def.xml: The "tsDir" attribute was not

Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = include . doc example @PYTHON_SUBDIR@
+SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
 
-DIST_SUBDIRS = include . doc example python
+DIST_SUBDIRS = include . doc example python xstc
 
 INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
 
@@ -126,6 +126,7 @@ tests: XMLtests XMLenttests NStests IDtests Errtests @READER_TEST@ @TEST_SAX@ @T
 	@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
 	    $(MAKE) MAKEFLAGS+=--silent tests ; fi)
 	@(cd doc/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
+	@(cd xstc ; $(MAKE) MAKEFLAGS+=--silent tests)
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'

configure.in

@@ -1080,6 +1080,6 @@ rm -f COPYING.LIB COPYING
 ln -s Copyright COPYING
 
 # keep on one line for cygwin c.f. #130896
-AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py)
+AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py)
 
 chmod +x xml2-config python/setup.py

xstc/.cvsignore

+XSTC-20020116.tar.gz
+msxsdtest
+nisttest
+suntest
+

xstc/Makefile.am

+PYSCRIPTS=nist-test.py ms-test.py sun-test.py
+TESTDIRS=msxsdtest nisttest suntest
+TARBALL=XSTC-20020116.tar.gz
+TARBALLURL=http://www.w3.org/2001/05/xmlschema-test-collection/$(TARBALL)
+
+all:
+
+nist-test.py: nist-test-def.xml xstc-to-python.xsl
+	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	  echo "Rebuilding script" $@ ;					\
+	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	                     $(srcdir)/nist-test-def.xml > $@ ;		\
+	  chmod +x $@ ; fi )
+
+ms-test.py: ms-test-def.xml xstc-to-python.xsl
+	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	  echo "Rebuilding script" $@ ;					\
+	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	                     $(srcdir)/ms-test-def.xml > $@ ;		\
+	  chmod +x $@ ; fi )
+
+sun-test.py: sun-test-def.xml xstc-to-python.xsl
+	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	  echo "Rebuilding script" $@ ;					\
+	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	                     $(srcdir)/sun-test-def.xml > $@ ;		\
+	  chmod +x $@ ; fi )
+
+$(TESTDIRS):
+	-@(if [ ! -f $(TARBALL) ] ; then 				\
+	   echo "Missing the test suite description, trying to fetch it" ;\
+	   if [ -x /usr/bin/wget ] ; then 				\
+	   wget $(TARBALLURL) ; 					\
+	   else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi)
+	-@(if [ -f $(TARBALL) ] ; then 					\
+	   echo -n "extracting tests directories..." ;			\
+	   $(TAR) -xzf $(TARBALL) $(TESTDIRS) ;				\
+	   echo "done" ;						\
+	   fi);
+
+pytests: $(PYSCRIPTS) $(TESTDIRS)
+	-@(if [ -x nist-test.py -a -d nisttest ] ; then 		\
+	   echo "# Running NIST Schemas tests";				\
+	   ./nist-test.py -s ; fi)
+	-@(if [ -x sun-test.py -a -d suntest ] ; then 			\
+	   echo "# Running Sun Schemas tests";				\
+	   ./sun-test.py -s ; fi)
+	-@(if [ -x ms-test.py -a -d msxsdtest ] ; then 			\
+	   echo "# Running Microsoft Schemas tests";			\
+	   ./ms-test.py -s ; fi)
+
+tests:
+	-@(if [ -x $(PYTHON) ] ; then 					\
+	   $(MAKE) MAKEFLAGS+=--silent pytests ; fi);
+
+clean:
+	rm -f $(PYSCRIPTS)
+
+distclean:
+	rm -rf $(PYSCRIPTS) $(TESTDIRS)