libxml2 r3674 - in trunk: . python python/tests

[veillard svn gnome org]

Author: veillard
Date: Fri Jan 11 07:19:24 2008
New Revision: 3674
URL: http://svn.gnome.org/viewvc/libxml2?rev=3674&view=rev

Log:
* check-relaxng-test-suite2.py check-relaxng-test-suite.py
  Makefile.am python/tests/Makefile.am python/Makefile.am
  check-xsddata-test-suite.py: patches from John Carr to
  start cleaning up 'make diskcheck' problems c.f. #506228
Daniel


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/check-relaxng-test-suite.py
   trunk/check-relaxng-test-suite2.py
   trunk/check-xsddata-test-suite.py
   trunk/python/Makefile.am
   trunk/python/tests/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jan 11 07:19:24 2008
@@ -856,23 +856,23 @@
 	      rm result.$$name ; \
 	  fi ; fi ; done)
 
-$(srcdir)/dba100000.xml: dbgenattr.pl
+dba100000.xml: dbgenattr.pl
 	@echo "## generating dba100000.xml"
-	@($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > $(srcdir)/dba100000.xml)
+	@($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > dba100000.xml)
 
-Timingtests: xmllint$(EXEEXT) $(srcdir)/dba100000.xml
+Timingtests: xmllint$(EXEEXT) dba100000.xml
 	@echo "## Timing tests to try to detect performance"
 	@echo "## as well a memory usage breakage when streaming"
 	@echo "## 1/ using the file interface"
 	@echo "## 2/ using the memory interface"
 	@echo "## 3/ repeated DOM parsing"
 	@echo "## 4/ repeated DOM validation"
-	-@($(top_builddir)/xmllint --stream --timing $(srcdir)/dba100000.xml; \
+	-@($(top_builddir)/xmllint --stream --timing dba100000.xml; \
 	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
 	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
 	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	   exit 0)
-	-@($(top_builddir)/xmllint --stream --timing --memory $(srcdir)/dba100000.xml; \
+	-@($(top_builddir)/xmllint --stream --timing --memory dba100000.xml; \
 	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
 	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
 	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
@@ -1177,6 +1177,15 @@
 	- INSTALL@ -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR)
 	- INSTALL@ -m 0644 $(srcdir)/testXPath.c $(DESTDIR)$(EXAMPLES_DIR)
 
+uninstall-local:
+	rm $(DESTDIR)$(EXAMPLES_DIR)/testXPath.c
+	rm $(DESTDIR)$(EXAMPLES_DIR)/testHTML.c
+	rm $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c
+	rm $(DESTDIR)$(EXAMPLES_DIR)/xmllint.c
+	rm -rf $(DESTDIR)$(EXAMPLES_DIR)
+	rm $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)/Copyright
+	rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
+
 tst: tst.c
 	$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
 

Modified: trunk/check-relaxng-test-suite.py
==============================================================================
--- trunk/check-relaxng-test-suite.py	(original)
+++ trunk/check-relaxng-test-suite.py	Fri Jan 11 07:19:24 2008
@@ -16,7 +16,7 @@
 #
 # the testsuite description
 #
-CONF="test/relaxng/OASIS/spectest.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/relaxng/OASIS/spectest.xml")
 LOG="check-relaxng-test-suite.log"
 RES="relaxng-test-results.xml"
 

Modified: trunk/check-relaxng-test-suite2.py
==============================================================================
--- trunk/check-relaxng-test-suite2.py	(original)
+++ trunk/check-relaxng-test-suite2.py	Fri Jan 11 07:19:24 2008
@@ -15,7 +15,7 @@
 #
 # the testsuite description
 #
-CONF="test/relaxng/testsuite.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/relaxng/testsuite.xml")
 LOG="check-relaxng-test-suite2.log"
 
 log = open(LOG, "w")

Modified: trunk/check-xsddata-test-suite.py
==============================================================================
--- trunk/check-xsddata-test-suite.py	(original)
+++ trunk/check-xsddata-test-suite.py	Fri Jan 11 07:19:24 2008
@@ -16,7 +16,7 @@
 #
 # the testsuite description
 #
-CONF="test/xsdtest/xsdtestsuite.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/xsdtest/xsdtestsuite.xml")
 LOG="check-xsddata-test-suite.log"
 
 log = open(LOG, "w")

Modified: trunk/python/Makefile.am
==============================================================================
--- trunk/python/Makefile.am	(original)
+++ trunk/python/Makefile.am	Fri Jan 11 07:19:24 2008
@@ -49,6 +49,12 @@
 	@(for doc in $(DOCS) ; \
 	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
 
+uninstall-local:
+	@(for doc in $(DOCS) ; \
+	   do rm $(DESTDIR)$(DOCS_DIR)/`basename $$doc` ; done)
+	rm $(DESTDIR)$(pythondir)/drv_libxml2.py
+	rm $(DESTDIR)$(pythondir)/libxml2.py
+	
 GENERATE = generator.py
 API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
 GENERATED= libxml2class.py \

Modified: trunk/python/tests/Makefile.am
==============================================================================
--- trunk/python/tests/Makefile.am	(original)
+++ trunk/python/tests/Makefile.am	Fri Jan 11 07:19:24 2008
@@ -77,3 +77,7 @@
 	-(for test in $(PYTESTS) $(XMLS); \
 	  do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
 
+uninstall-local:
+	@(for test in $(PYTESTS) $(XMLS) ; \
+	   do rm $(DESTDIR)$(EXAMPLE_DIR)/`basename $$test` ; done)
+