diff --git a/.gitignore b/.gitignore index 51203828..c4881df9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ /testrecurse # Tests -/dba100000.xml /missing.lst /runsuite.log /runxmlconf.log diff --git a/Makefile.am b/Makefile.am index 1fe53ae4..790f7b8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,7 +198,7 @@ asan: # Old test suite. This should be ported to C. -OLD_TESTS = Timingtests +OLD_TESTS = if WITH_SCHEMAS_SOURCES if WITH_PYTHON OLD_TESTS += RelaxNGPythonTests SchemasPythonTests @@ -207,38 +207,9 @@ endif if WITH_SCHEMATRON_SOURCES OLD_TESTS += Schematrontests endif -if WITH_VALID_SOURCES -OLD_TESTS += VTimingtests -endif tests: $(OLD_TESTS) -dba100000.xml: dbgenattr.pl - @echo "## generating dba100000.xml" - @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > 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 dba100000.xml; \ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - exit 0) - -@($(top_builddir)/xmllint --stream --timing --memory dba100000.xml; \ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - exit 0) - -@($(top_builddir)/xmllint --noout --timing --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - exit 0) - -VTimingtests: xmllint$(EXEEXT) - -@($(top_builddir)/xmllint --noout --timing --valid --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \ - if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \ - exit 0) - Schematrontests: xmllint$(EXEEXT) @echo "## Schematron regression tests" -@(for i in $(srcdir)/test/schematron/*.sct ; do \ @@ -306,7 +277,6 @@ EXTRA_DIST = Copyright check-xml-test-suite.py gentest.py \ libxml2-config.cmake.in autogen.sh \ libxml.h \ genUnicode.py \ - dbgen.pl dbgenattr.pl \ libxml2.syms timsort.h \ README.zOS README.md \ CMakeLists.txt config.h.cmake.in libxml2-config.cmake.cmake.in \ diff --git a/configure.ac b/configure.ac index de70e705..2fedd873 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MKDIR_P AC_PATH_PROG(TAR, tar, /bin/tar) -AC_PATH_PROG(PERL, perl, /usr/bin/perl) AC_PATH_PROG(WGET, wget, /usr/bin/wget) AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) PKG_PROG_PKG_CONFIG diff --git a/dbgen.pl b/dbgen.pl deleted file mode 100755 index 1383d6e9..00000000 --- a/dbgen.pl +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/perl - -$size = shift; - -if ($size eq "") -{ - die "usage: dbgen.pl [size]\n"; -} - -@firstnames = ("Al", "Bob", "Charles", "David", "Egon", "Farbood", - "George", "Hank", "Inki", "James"); -@lastnames = ("Aranow", "Barker", "Corsetti", "Dershowitz", "Engleman", - "Franklin", "Grice", "Haverford", "Ilvedson", "Jones"); -@states = ("AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "FL", "GA", - "HI", "ID", "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", - "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV", "NH", "NJ", - "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC", - "SD", "TN", "TX", "UT", "VT", "VA", "WA", "WV", "WI", "WY"); - -print "\n"; -print "\n"; -print "\n"; - -for ($i=0; $i<$size; $i++) -{ - $first = $firstnames [$i % 10]; - $last = $lastnames [($i / 10) % 10]; - $state = $states [($i / 100) % 50]; - $zip = 22000 + $i / 5000; - - printf " \n"; - printf " %04d\n", $i; - printf " $first\n", $i; - printf " $last\n", $i; - printf " %d Any St.\n", ($i % 100) + 1; - printf " Anytown\n"; - printf " $state\n"; - printf " %d\n", $zip; - printf " \n"; -} - -print "
\n"; - diff --git a/dbgenattr.pl b/dbgenattr.pl deleted file mode 100755 index dce11cd8..00000000 --- a/dbgenattr.pl +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/perl - -$size = shift; - -if ($size eq "") -{ - die "usage: dbgen.pl [size]\n"; -} - -@firstnames = ("Al", "Bob", "Charles", "David", "Egon", "Farbood", - "George", "Hank", "Inki", "James"); -@lastnames = ("Aranow", "Barker", "Corsetti", "Dershowitz", "Engleman", - "Franklin", "Grice", "Haverford", "Ilvedson", "Jones"); -@states = ("AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "FL", "GA", - "HI", "ID", "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", - "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV", "NH", "NJ", - "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC", - "SD", "TN", "TX", "UT", "VT", "VA", "WA", "WV", "WI", "WY"); - -print "\n"; -print "\n"; -print "\n"; - -for ($i=0; $i<$size; $i++) -{ - $first = $firstnames [$i % 10]; - $last = $lastnames [($i / 10) % 10]; - $state = $states [($i / 100) % 50]; - $zip = 22000 + $i / 5000; - - printf " \n", $zip; -} - -print "
\n"; -