[libxml2] Misc fixes for 'make tests'

From: Nick Wellnhofer <nwellnhof src gnome org>
To: commits-list gnome org
Cc:
Subject: [libxml2] Misc fixes for 'make tests'
Date: Mon, 12 Jun 2017 17:57:44 +0000 (UTC)
commit 67f9f9d6c836bb5ae5085860dc543324f8f08b6f
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Mon Jun 12 19:25:01 2017 +0200

    Misc fixes for 'make tests'
    
    - Silence test output.
    - Clean up after doc/examples tests.
    - Adjust expected output for script tests.
    - Add missing results for relaxng/pattern3
    
    There are still two test failures I can't comment on:
    
    - regexp/bug316338
    - schemas/any4_0

 Makefile.am                   |   16 +++++++-------
 doc/examples/Makefile.am      |   43 +++++++++++++++++++++++++---------------
 result/relaxng/pattern3_err   |    1 +
 result/scripts/set3.err       |    2 +-
 4 files changed, 37 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 10e716a..51b253e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,8 +229,8 @@ testall : tests SVGtests SAXtests
 
 tests: XMLtests XMLenttests NStests IDtests Errtests APItests $(READER_TEST) $(TEST_SAX) $(TEST_PUSH) 
$(TEST_HTML) $(TEST_PHTML) $(TEST_VALID) URItests $(TEST_PATTERN) $(TEST_XPATH) $(TEST_XPTR) $(TEST_XINCLUDE) 
$(TEST_C14N) $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMAS) $(TEST_SCHEMATRON) $(TEST_THREADS) 
Timingtests $(TEST_VTIME) $(PYTHON_TESTS) $(TEST_MODULES)
        @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
-           $(MAKE) tests ; fi)
-       @(cd doc/examples ; $(MAKE) tests)
+           $(MAKE) -s tests ; fi)
+       @(cd doc/examples ; $(MAKE) -s tests)
 
 APItests: testapi$(EXEEXT)
        @echo "## Running the API regression tests this may take a little while"
@@ -528,10 +528,10 @@ XPathtests : testXPath$(EXEEXT)
          if [ ! -d $$i ] ; then \
          if [ ! -f $(srcdir)/result/XPath/expr/$$name ] ; then \
              echo New test file $$name ; \
-             $(CHECKER) $(top_builddir)/testXPath -f --expr $$i > $(srcdir)/result/XPath/expr/$$name ; \
+             $(CHECKER) $(top_builddir)/testXPath -f --expr $$i > $(srcdir)/result/XPath/expr/$$name 2> 
/dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
          else \
-             log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i 2>&1 > result.$$name ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i > result.$$name 2> /dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
              diff $(srcdir)/result/XPath/expr/$$name result.$$name` ; \
              if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
@@ -549,7 +549,7 @@ XPathtests : testXPath$(EXEEXT)
              $(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j > $(srcdir)/result/XPath/tests/$$name ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
          else \
-             log=`$(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j 2>&1 > result.$$name ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j > result.$$name ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
              diff $(srcdir)/result/XPath/tests/$$name result.$$name` ; \
              if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
@@ -570,10 +570,10 @@ XPtrtests : testXPath$(EXEEXT)
          if [ ! -d $$j ] ; then \
          if [ ! -f $(srcdir)/result/XPath/xptr/$$name ] ; then \
              echo New test file $$name ; \
-             $(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > $(srcdir)/result/XPath/xptr/$$name ; 
\
+             $(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > $(srcdir)/result/XPath/xptr/$$name 
2> /dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
          else \
-             log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j 2>&1 > result.$$name ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > result.$$name 2> /dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
              diff $(srcdir)/result/XPath/xptr/$$name result.$$name` ; \
              if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
@@ -984,7 +984,7 @@ C14Ntests : testC14N$(EXEEXT)
                            cmdline="$$cmdline '`cat $(srcdir)/test/c14n/$$m/$$name.ns`'"; \
                        fi; \
                    fi; \
-                   $$cmdline > $(srcdir)/test/c14n/test.tmp; \
+                   $$cmdline > $(srcdir)/test/c14n/test.tmp 2> /dev/null; \
                    if [ $$? -eq 0 ]; then \
                        diff  $(srcdir)/result/c14n/$$m/$$name $(srcdir)/test/c14n/test.tmp; \
                        if [ $$? -ne 0 ]; then \
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 57af9c2..9804585 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -100,36 +100,47 @@ valgrind:
        $(MAKE) CHECKER='valgrind' tests
 
 tests: $(noinst_PROGRAMS)
-       test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
+       @test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
        @(echo '## examples regression tests')
        @(echo > .memdump)
-       $(CHECKER) ./io1 > io1.tmp && diff io1.tmp $(srcdir)/io1.res
+       @$(CHECKER) ./io1 > io1.tmp && diff io1.tmp $(srcdir)/io1.res
+       @rm io1.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./io2 > io2.tmp && diff io2.tmp $(srcdir)/io2.res
+       @$(CHECKER) ./io2 > io2.tmp && diff io2.tmp $(srcdir)/io2.res
+       @rm io2.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./parse1 test1.xml
+       @$(CHECKER) ./parse1 test1.xml
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./parse2 test2.xml
+       @$(CHECKER) ./parse2 test2.xml
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./parse3
+       @$(CHECKER) ./parse3
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./parse4 test3.xml
+       @$(CHECKER) ./parse4 test3.xml
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./reader1 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+       @$(CHECKER) ./reader1 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+       @rm reader1.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./reader2 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+       @$(CHECKER) ./reader2 test2.xml > reader1.tmp && diff reader1.tmp $(srcdir)/reader1.res
+       @rm reader1.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./reader3 > reader3.tmp && diff reader3.tmp $(srcdir)/reader3.res
+       @$(CHECKER) ./reader3 > reader3.tmp && diff reader3.tmp $(srcdir)/reader3.res
+       @rm reader3.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp && diff reader4.tmp 
$(srcdir)/reader4.res
+       @$(CHECKER) ./reader4 test1.xml test2.xml test3.xml > reader4.tmp && diff reader4.tmp 
$(srcdir)/reader4.res
+       @rm reader4.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./testWriter && for i in 1 2 3 4 ; do diff $(srcdir)/writer.xml writer$$i.tmp || break ; 
done
+       @$(CHECKER) ./testWriter && for i in 1 2 3 4 ; do diff $(srcdir)/writer.xml writer$$i.tmp || break ; 
done
+       @rm writer[1-4].tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./tree1 test2.xml > tree1.tmp && diff tree1.tmp $(srcdir)/tree1.res
+       @$(CHECKER) ./tree1 test2.xml > tree1.tmp && diff tree1.tmp $(srcdir)/tree1.res
+       @rm tree1.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./tree2 > tree2.tmp && diff tree2.tmp $(srcdir)/tree2.res
+       @$(CHECKER) ./tree2 > tree2.tmp && diff tree2.tmp $(srcdir)/tree2.res
+       @rm tree2.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./xpath1 test3.xml '//child2' > xpath1.tmp && diff xpath1.tmp $(srcdir)/xpath1.res
+       @$(CHECKER) ./xpath1 test3.xml '//child2' > xpath1.tmp && diff xpath1.tmp $(srcdir)/xpath1.res
+       @rm xpath1.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
-       $(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp && diff xpath2.tmp 
$(srcdir)/xpath2.res
+       @$(CHECKER) ./xpath2 test3.xml '//discarded' discarded > xpath2.tmp && diff xpath2.tmp 
$(srcdir)/xpath2.res
+       @rm xpath2.tmp
        @grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" ; exit 0
diff --git a/result/relaxng/pattern3_err b/result/relaxng/pattern3_err
new file mode 100644
index 0000000..a7a1f46
--- /dev/null
+++ b/result/relaxng/pattern3_err
@@ -0,0 +1 @@
+./test/relaxng/pattern3.rng validates
diff --git a/result/relaxng/pattern3_valid b/result/relaxng/pattern3_valid
new file mode 100644
index 0000000..e69de29
diff --git a/result/scripts/set3.err b/result/scripts/set3.err
index 18f0d69..0dd7792 100644
--- a/result/scripts/set3.err
+++ b/result/scripts/set3.err
@@ -1,3 +1,3 @@
-./test/scripts/set3.xml:1: parser warning : xmlns: URI bar is not absolute
+./test/scripts/set3.xml:1: namespace warning : xmlns: URI bar is not absolute
 <a xmlns="bar">foo</a>
               ^
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]