diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .gitlab-ci/test.sh | 5 | ||||
-rw-r--r-- | .gitlab-ci/test_cmake.sh | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 34 | ||||
-rw-r--r-- | Makefile.am | 18 | ||||
-rw-r--r-- | configure.ac | 22 | ||||
-rw-r--r-- | libxslt.spec.in | 2 | ||||
-rw-r--r-- | python/tests/Makefile.am | 4 | ||||
-rw-r--r-- | tests/Makefile.am | 59 | ||||
-rw-r--r-- | tests/REC/Makefile.am | 219 | ||||
-rw-r--r-- | tests/REC/test-6.1.out | 0 | ||||
-rw-r--r-- | tests/REC1/Makefile.am | 23 | ||||
-rw-r--r-- | tests/REC2/Makefile.am | 30 | ||||
-rw-r--r-- | tests/REC2/data.xml | 21 | ||||
-rw-r--r-- | tests/REC2/html.out | 32 | ||||
-rw-r--r-- | tests/REC2/html.xml | 53 | ||||
-rw-r--r-- | tests/REC2/svg.out | 18 | ||||
-rw-r--r-- | tests/REC2/svg.xml | 39 | ||||
-rw-r--r-- | tests/REC2/vrml.out | 38 | ||||
-rw-r--r-- | tests/REC2/vrml.xml | 59 | ||||
-rw-r--r-- | tests/XSLTMark/Makefile.am | 8 | ||||
-rw-r--r-- | tests/docbook/Makefile.am | 6 | ||||
-rw-r--r-- | tests/docs/Makefile.am | 228 | ||||
-rw-r--r-- | tests/documents/Makefile.am | 42 | ||||
-rw-r--r-- | tests/documents/bredfort.out (renamed from tests/documents/result.xhtml) | 0 | ||||
-rw-r--r-- | tests/documents/bredfort.xml (renamed from tests/documents/index.xml) | 0 | ||||
-rw-r--r-- | tests/documents/fragment.out (renamed from tests/documents/fragment.result) | 0 | ||||
-rw-r--r-- | tests/documents/message.err (renamed from tests/documents/message.result) | 0 | ||||
-rw-r--r-- | tests/documents/test.out (renamed from tests/documents/test.result) | 0 | ||||
-rw-r--r-- | tests/documents/test_bad.err | 4 | ||||
-rw-r--r-- | tests/documents/test_bad.out (renamed from tests/documents/test_bad.result) | 0 | ||||
-rw-r--r-- | tests/documents/test_bad.xsl | 16 | ||||
-rw-r--r-- | tests/exslt/Makefile.am | 12 | ||||
-rw-r--r-- | tests/exslt/common/Makefile.am | 56 | ||||
-rw-r--r-- | tests/exslt/crypto/Makefile.am | 47 | ||||
-rw-r--r-- | tests/exslt/date/Makefile.am | 86 | ||||
-rw-r--r-- | tests/exslt/date/sum.2.err | 0 | ||||
-rw-r--r-- | tests/exslt/dynamic/Makefile.am | 52 | ||||
-rw-r--r-- | tests/exslt/functions/Makefile.am | 56 | ||||
-rw-r--r-- | tests/exslt/math/Makefile.am | 57 | ||||
-rw-r--r-- | tests/exslt/saxon/Makefile.am | 45 | ||||
-rw-r--r-- | tests/exslt/saxon/eval.2.out | 0 | ||||
-rw-r--r-- | tests/exslt/saxon/eval.3.out | 0 | ||||
-rw-r--r-- | tests/exslt/sets/Makefile.am | 50 | ||||
-rw-r--r-- | tests/exslt/strings/Makefile.am | 53 | ||||
-rw-r--r-- | tests/extensions/Makefile.am | 51 | ||||
-rw-r--r-- | tests/fuzz/Makefile.am | 6 | ||||
-rw-r--r-- | tests/general/Makefile.am | 310 | ||||
-rw-r--r-- | tests/general/array.xml (renamed from tests/docs/array.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-1-.xml (renamed from tests/docs/bug-1-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-10-.xml (renamed from tests/docs/bug-10-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-100.xml (renamed from tests/docs/bug-100.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-101.xml (renamed from tests/docs/bug-101.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-102.xml (renamed from tests/docs/bug-102.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-103.xml (renamed from tests/docs/bug-103.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-104.xml (renamed from tests/docs/bug-104.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-105.xml (renamed from tests/docs/bug-105.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-106.xml (renamed from tests/docs/bug-106.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-107.xml (renamed from tests/docs/bug-107.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-108.xml (renamed from tests/docs/bug-108.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-109.xml (renamed from tests/docs/bug-109.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-11-.xml (renamed from tests/docs/bug-11-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-110.ent (renamed from tests/docs/bug-110.ent) | 0 | ||||
-rw-r--r-- | tests/general/bug-110.err | 0 | ||||
-rw-r--r-- | tests/general/bug-110.xml (renamed from tests/docs/bug-110.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-111.xml (renamed from tests/docs/bug-111.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-112.xml (renamed from tests/docs/bug-112.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-113.xml (renamed from tests/docs/bug-113.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-114.xml (renamed from tests/docs/bug-114.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-115.xml (renamed from tests/docs/bug-115.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-116.xml (renamed from tests/docs/bug-116.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-117.xml (renamed from tests/docs/bug-117.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-118.xml (renamed from tests/docs/bug-118.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-119.xml (renamed from tests/docs/bug-119.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-12-.xml (renamed from tests/docs/bug-12-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-120.xml (renamed from tests/docs/bug-120.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-121.xml (renamed from tests/docs/bug-121.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-122.xml (renamed from tests/docs/bug-122.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-123.xml (renamed from tests/docs/bug-123.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-124.xml (renamed from tests/docs/bug-124.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-125.xml (renamed from tests/docs/bug-125.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-126.xml (renamed from tests/docs/bug-126.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-127.xml (renamed from tests/docs/bug-127.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-128.xml (renamed from tests/docs/bug-128.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-129.xml (renamed from tests/docs/bug-129.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-13-.xml (renamed from tests/docs/bug-13-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-130.doc (renamed from tests/docs/bug-130.doc) | 0 | ||||
-rw-r--r-- | tests/general/bug-130.xml (renamed from tests/docs/bug-130.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-130.xsl | 2 | ||||
-rw-r--r-- | tests/general/bug-131.xml (renamed from tests/docs/bug-131.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-132.xml (renamed from tests/docs/bug-132.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-133.xml (renamed from tests/docs/bug-133.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-134.xml (renamed from tests/docs/bug-134.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-135.xml (renamed from tests/docs/bug-135.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-136.xml (renamed from tests/docs/bug-136.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-137.xml (renamed from tests/docs/bug-137.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-138.xml (renamed from tests/docs/bug-138.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-139.xml (renamed from tests/docs/bug-139.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-14-.xml (renamed from tests/docs/bug-14-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-140.xml (renamed from tests/docs/bug-140.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-141.xml (renamed from tests/docs/bug-141.xml) | 0 | ||||
-rwxr-xr-x | tests/general/bug-142.xml (renamed from tests/docs/bug-142.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-143.xml (renamed from tests/docs/bug-143.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-144.xml (renamed from tests/docs/bug-144.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-145.err | 2 | ||||
-rw-r--r-- | tests/general/bug-145.out | 0 | ||||
-rw-r--r-- | tests/general/bug-145.xml (renamed from tests/docs/bug-145.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-146.xml (renamed from tests/docs/bug-146.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-147.xml (renamed from tests/docs/bug-147.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-148.xml (renamed from tests/docs/bug-148.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-149.xml (renamed from tests/docs/bug-149.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-15-.xml (renamed from tests/docs/bug-15-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-150.xml (renamed from tests/docs/bug-150.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-151.out | 0 | ||||
-rw-r--r-- | tests/general/bug-151.xml (renamed from tests/docs/bug-151.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-152.xml (renamed from tests/docs/bug-152.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-153.doc (renamed from tests/docs/bug-153.doc) | 0 | ||||
-rw-r--r-- | tests/general/bug-153.xml (renamed from tests/docs/bug-153.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-153.xsl | 2 | ||||
-rw-r--r-- | tests/general/bug-154.out | 0 | ||||
-rw-r--r-- | tests/general/bug-154.xml (renamed from tests/docs/bug-154.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-155.xml (renamed from tests/docs/bug-155.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-156.out | 0 | ||||
-rw-r--r-- | tests/general/bug-156.xml (renamed from tests/docs/bug-156.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-157.xml (renamed from tests/docs/bug-157.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-158.doc (renamed from tests/docs/bug-158.doc) | 0 | ||||
-rw-r--r-- | tests/general/bug-158.xml (renamed from tests/docs/bug-158.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-158.xsl | 2 | ||||
-rw-r--r-- | tests/general/bug-159.xml (renamed from tests/docs/bug-159.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-16-.xml (renamed from tests/docs/bug-16-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-160.xml (renamed from tests/docs/bug-160.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-161.xml (renamed from tests/docs/bug-161.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-163.xml (renamed from tests/docs/bug-163.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-164.xml (renamed from tests/docs/bug-164.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-165.err | 2 | ||||
-rw-r--r-- | tests/general/bug-165.out | 0 | ||||
-rw-r--r-- | tests/general/bug-165.xml (renamed from tests/docs/bug-165.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-166.xml (renamed from tests/docs/bug-166.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-167.xml (renamed from tests/docs/bug-167.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-168.xml (renamed from tests/docs/bug-168.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-169.xml (renamed from tests/docs/bug-169.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-17-.xml (renamed from tests/docs/bug-17-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-170.xml (renamed from tests/docs/bug-170.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-171.xml (renamed from tests/docs/bug-171.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-172.xml (renamed from tests/docs/bug-172.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-173.xml (renamed from tests/docs/bug-173.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-174.out | 0 | ||||
-rw-r--r-- | tests/general/bug-174.xml (renamed from tests/docs/bug-174.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-175.xml (renamed from tests/docs/bug-175.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-176.xml (renamed from tests/docs/bug-176.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-177.xml (renamed from tests/docs/bug-177.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-178.xml (renamed from tests/docs/bug-178.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-179.xml (renamed from tests/docs/bug-179.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-18-.xml (renamed from tests/docs/bug-18-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-180.err | 2 | ||||
-rw-r--r-- | tests/general/bug-180.out | 0 | ||||
-rw-r--r-- | tests/general/bug-180.xml (renamed from tests/docs/bug-180.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-181.xml (renamed from tests/docs/bug-181.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-182.xml (renamed from tests/docs/bug-182.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-183.xml (renamed from tests/docs/bug-183.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-184.err | 2 | ||||
-rw-r--r-- | tests/general/bug-184.out | 0 | ||||
-rw-r--r-- | tests/general/bug-184.xml (renamed from tests/docs/bug-184.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-186.xml (renamed from tests/docs/bug-186.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-187.xml (renamed from tests/docs/bug-187.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-188.xml (renamed from tests/docs/bug-188.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-189.xml (renamed from tests/docs/bug-189.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-19-.xml (renamed from tests/docs/bug-19-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-190.xml (renamed from tests/docs/bug-190.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-191.out | 0 | ||||
-rw-r--r-- | tests/general/bug-191.xml (renamed from tests/docs/bug-191.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-192.xml (renamed from tests/docs/bug-192.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-193.xml (renamed from tests/docs/bug-193.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-194.err | 2 | ||||
-rw-r--r-- | tests/general/bug-194.out | 0 | ||||
-rw-r--r-- | tests/general/bug-194.xml (renamed from tests/docs/bug-194.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-195.xml (renamed from tests/docs/bug-195.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-196.xml (renamed from tests/docs/bug-196.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-197.xml (renamed from tests/docs/bug-197.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-198.xml (renamed from tests/docs/bug-198.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-199.xml (renamed from tests/docs/bug-199.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-2-.xml (renamed from tests/docs/bug-2-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-20-.xml (renamed from tests/docs/bug-20-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-200.xml (renamed from tests/docs/bug-200.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-201.err | 2 | ||||
-rw-r--r-- | tests/general/bug-201.out | 0 | ||||
-rw-r--r-- | tests/general/bug-201.xml (renamed from tests/docs/bug-201.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-202.out | 0 | ||||
-rw-r--r-- | tests/general/bug-202.xml (renamed from tests/docs/bug-202.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-203.out | 0 | ||||
-rw-r--r-- | tests/general/bug-203.xml (renamed from tests/docs/bug-203.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-204.out | 0 | ||||
-rw-r--r-- | tests/general/bug-204.xml (renamed from tests/docs/bug-204.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-205.xml (renamed from tests/docs/bug-205.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-206.xml (renamed from tests/docs/bug-206.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-207.xml (renamed from tests/docs/bug-207.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-208.err | 2 | ||||
-rw-r--r-- | tests/general/bug-208.out | 0 | ||||
-rw-r--r-- | tests/general/bug-208.xml (renamed from tests/docs/bug-208.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-209.xml (renamed from tests/docs/bug-209.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-21-.out | 2 | ||||
-rw-r--r-- | tests/general/bug-21-.xml (renamed from tests/docs/bug-21-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-210.xml (renamed from tests/docs/bug-210.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-211.xml (renamed from tests/docs/bug-211.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-212.xml (renamed from tests/docs/bug-212.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-213.xml (renamed from tests/docs/bug-213.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-214.xml (renamed from tests/docs/bug-214.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-215.err | 2 | ||||
-rw-r--r-- | tests/general/bug-215.out | 0 | ||||
-rw-r--r-- | tests/general/bug-215.xml (renamed from tests/docs/bug-215.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-216.xml (renamed from tests/docs/bug-216.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-217.xml (renamed from tests/docs/bug-217.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-218.xml (renamed from tests/docs/bug-218.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-219.xml (renamed from tests/docs/bug-219.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-22-.xml (renamed from tests/docs/bug-22-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-220.xml (renamed from tests/docs/bug-220.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-221.xml (renamed from tests/docs/bug-221.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-222.xml (renamed from tests/docs/bug-222.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-23-.xml (renamed from tests/docs/bug-23-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-24-.xml (renamed from tests/docs/bug-24-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-25-.xml (renamed from tests/docs/bug-25-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-26-.xml (renamed from tests/docs/bug-26-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-27-.xml (renamed from tests/docs/bug-27-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-28-.xml (renamed from tests/docs/bug-28-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-29-.ent (renamed from tests/docs/bug-29-.ent) | 0 | ||||
-rw-r--r-- | tests/general/bug-29-.xml (renamed from tests/docs/bug-29-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-3-.xml (renamed from tests/docs/bug-3-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-30-.xml (renamed from tests/docs/bug-30-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-31-.xml (renamed from tests/docs/bug-31-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-32-.xml (renamed from tests/docs/bug-32-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-33-.xml (renamed from tests/docs/bug-33-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-35-.xml (renamed from tests/docs/bug-35-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-36-.xml (renamed from tests/docs/bug-36-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-37-.xml (renamed from tests/docs/bug-37-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-38-.xml (renamed from tests/docs/bug-38-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-39-.xml (renamed from tests/docs/bug-39-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-4-.xml (renamed from tests/docs/bug-4-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-40-.xml (renamed from tests/docs/bug-40-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-41-.xml (renamed from tests/docs/bug-41-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-42-.xml (renamed from tests/docs/bug-42-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-43-.xml (renamed from tests/docs/bug-43-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-44-.xml (renamed from tests/docs/bug-44-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-45-.xml (renamed from tests/docs/bug-45-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-46-.xml (renamed from tests/docs/bug-46-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-47-.xml (renamed from tests/docs/bug-47-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-48-.xml (renamed from tests/docs/bug-48-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-49-.xml (renamed from tests/docs/bug-49-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-5-.xml (renamed from tests/docs/bug-5-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-50-.xml (renamed from tests/docs/bug-50-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-52.out | 2 | ||||
-rw-r--r-- | tests/general/bug-52.xml (renamed from tests/docs/bug-52.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-53.xml (renamed from tests/docs/bug-53.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-54.xml (renamed from tests/docs/bug-54.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-55.xml (renamed from tests/docs/bug-55.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-56.xml (renamed from tests/docs/bug-56.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-57.xml (renamed from tests/docs/bug-57.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-59.xml (renamed from tests/docs/bug-59.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-6-.xml (renamed from tests/docs/bug-6-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-60.xml (renamed from tests/docs/bug-60.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-61.xml (renamed from tests/docs/bug-61.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-62.xml (renamed from tests/docs/bug-62.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-63.xml (renamed from tests/docs/bug-63.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-64.xml (renamed from tests/docs/bug-64.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-65.xml (renamed from tests/docs/bug-65.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-66.xml (renamed from tests/docs/bug-66.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-68.xml (renamed from tests/docs/bug-68.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-69.xml (renamed from tests/docs/bug-69.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-7-.xml (renamed from tests/docs/bug-7-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-70.xml (renamed from tests/docs/bug-70.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-71.xml (renamed from tests/docs/bug-71.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-72.xml (renamed from tests/docs/bug-72.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-73.xml (renamed from tests/docs/bug-73.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-74.xml (renamed from tests/docs/bug-74.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-75.xml (renamed from tests/docs/bug-75.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-76.xml (renamed from tests/docs/bug-76.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-77.xml (renamed from tests/docs/bug-77.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-78.xml (renamed from tests/docs/bug-78.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-79.xml (renamed from tests/docs/bug-79.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-8-.xml (renamed from tests/docs/bug-8-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-80.xml (renamed from tests/docs/bug-80.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-81.xml (renamed from tests/docs/bug-81.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-82.xml (renamed from tests/docs/bug-82.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-83.xml (renamed from tests/docs/bug-83.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-84.xml (renamed from tests/docs/bug-84.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-86.xml (renamed from tests/docs/bug-86.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-87.xml (renamed from tests/docs/bug-87.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-88.xml (renamed from tests/docs/bug-88.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-89.xml (renamed from tests/docs/bug-89.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-9-.xml (renamed from tests/docs/bug-9-.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-90.xml (renamed from tests/docs/bug-90.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-91.xml (renamed from tests/docs/bug-91.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-92.xml (renamed from tests/docs/bug-92.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-93.xml (renamed from tests/docs/bug-93.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-94.xml (renamed from tests/docs/bug-94.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-95.xml (renamed from tests/docs/bug-95.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-96.xml (renamed from tests/docs/bug-96.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-97.xml (renamed from tests/docs/bug-97.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-98.xml (renamed from tests/docs/bug-98.xml) | 0 | ||||
-rw-r--r-- | tests/general/bug-99.xml (renamed from tests/docs/bug-99.xml) | 0 | ||||
-rw-r--r-- | tests/general/character.xml (renamed from tests/docs/character.xml) | 0 | ||||
-rw-r--r-- | tests/general/date_add.xml (renamed from tests/docs/date_add.xml) | 0 | ||||
-rw-r--r-- | tests/general/doc.dtd (renamed from tests/REC1/doc.dtd) | 0 | ||||
-rw-r--r-- | tests/general/doc.out (renamed from tests/REC1/result.xml) | 0 | ||||
-rw-r--r-- | tests/general/doc.xml (renamed from tests/REC1/doc.xml) | 0 | ||||
-rw-r--r-- | tests/general/doc.xsl (renamed from tests/REC1/doc.xsl) | 0 | ||||
-rw-r--r-- | tests/general/items.xml (renamed from tests/docs/items.xml) | 0 | ||||
-rw-r--r-- | tests/keys/Makefile.am | 23 | ||||
-rw-r--r-- | tests/keys/dates.out (renamed from tests/keys/month.out) | 0 | ||||
-rw-r--r-- | tests/keys/dates.xsl (renamed from tests/keys/month.xsl) | 0 | ||||
-rw-r--r-- | tests/multiple/Makefile.am | 6 | ||||
-rw-r--r-- | tests/namespaces/Makefile.am | 59 | ||||
-rw-r--r-- | tests/namespaces/extra2.out | 0 | ||||
-rw-r--r-- | tests/numbers/Makefile.am | 21 | ||||
-rw-r--r-- | tests/plugins/Makefile.am | 43 | ||||
-rw-r--r-- | tests/reports/Makefile.am | 57 | ||||
-rw-r--r-- | tests/reports/recglobparam.out | 0 | ||||
-rw-r--r-- | tests/reports/recglobvar.out | 0 | ||||
-rw-r--r-- | tests/reports/reclocparam.out | 0 | ||||
-rw-r--r-- | tests/reports/reclocvar.out | 0 | ||||
-rw-r--r-- | tests/reports/tst-1.out | 0 | ||||
-rw-r--r-- | tests/reports/tst-2.out | 0 | ||||
-rw-r--r-- | tests/reports/undefvar.out | 0 | ||||
-rw-r--r-- | tests/runtest.c | 866 | ||||
-rw-r--r-- | tests/testplugin.c (renamed from tests/plugins/testplugin.c) | 0 | ||||
-rw-r--r-- | tests/xinclude/Makefile.am | 6 | ||||
-rw-r--r-- | tests/xmlspec/Makefile.am | 6 | ||||
-rw-r--r-- | xsltproc/Makefile.am | 5 |
327 files changed, 1141 insertions, 1843 deletions
@@ -48,6 +48,7 @@ python/libxsltclass.py python/libxsltclass.txt python/tests/foo stamp-h1 +tests/runtest tests/xmlspec/debug xslt-config xsltConf.sh diff --git a/.gitlab-ci/test.sh b/.gitlab-ci/test.sh index fcef8704..6028250f 100644 --- a/.gitlab-ci/test.sh +++ b/.gitlab-ci/test.sh @@ -10,7 +10,4 @@ cd .. sh autogen.sh $CONFIG --with-libxml-src=libxml2 make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror" -make -s -C tests tests | tee test.log -make -s -C xsltproc tests | tee -a test.log -grep -qv '^## Running' test.log && exit 1 -make -s -C python tests +make -s check diff --git a/.gitlab-ci/test_cmake.sh b/.gitlab-ci/test_cmake.sh index c17ef489..83b13f78 100644 --- a/.gitlab-ci/test_cmake.sh +++ b/.gitlab-ci/test_cmake.sh @@ -21,8 +21,10 @@ cmake "$@" \ -DCMAKE_C_FLAGS='-Werror' \ -S . -B libxslt-build cmake --build libxslt-build --target install + +(cd libxslt-build && ctest -VV) + mkdir -p libxslt-install/share/libxslt cp Copyright libxslt-install/share/libxslt - (cd libxslt-install && tar -czf ../libxslt-$CI_COMMIT_SHORT_SHA-$SUFFIX.tar.gz *) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a0ee9e4..e6272d1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,10 @@ option(LIBXSLT_WITH_THREADS "Add multithread support" ON) set(LIBXSLT_WITH_TRIO OFF) option(LIBXSLT_WITH_XSLT_DEBUG "Add the debugging code" ON) +if(NOT BUILD_SHARED_LIBS) + set(LIBXSLT_WITH_MODULES OFF) +endif() + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) find_package(Gcrypt REQUIRED) endif() @@ -352,10 +356,38 @@ install(TARGETS xsltproc EXPORT LibXslt RUNTIME DESTINATION ${CMAKE_INSTALL_BIND if(LIBXSLT_WITH_TESTS) enable_testing() + + if (NOT MSVC) + # TODO: + # - Unsupported encoding windows-1251 + # - Segfault in exslt dynamic tests + + add_executable(runtest tests/runtest.c) + target_link_libraries(runtest LibXslt LibExslt) + add_test( + NAME runtest COMMAND runtest + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests" + ) + + if (LIBXSLT_WITH_MODULES) + add_library(testplugin SHARED tests/testplugin.c) + target_link_libraries(testplugin LibExslt LibXslt) + set_target_properties( + testplugin PROPERTIES + PREFIX "" + OUTPUT_NAME xmlsoft_org_xslt_testplugin + ) + set_tests_properties( + runtest PROPERTIES + ENVIRONMENT "LIBXSLT_PLUGINS_PATH=${CMAKE_CURRENT_BINARY_DIR}" + ) + endif() + endif() + if(Threads_FOUND) add_executable(testThreads xsltproc/testThreads.c) target_link_libraries(testThreads LibXslt LibExslt Threads::Threads) - add_test(NAME testThreads COMMAND testThreads WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + add_test(NAME testThreads COMMAND testThreads) endif() endif() diff --git a/Makefile.am b/Makefile.am index a2d766f5..db50cddb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,24 +39,6 @@ xsltConf.sh: xsltConf.sh.in Makefile CLEANFILES = xsltConf.sh -check-local: tests - -dummy: - -tests: dummy - @echo '## Running the regression test suite' - @(cd tests ; $(MAKE) -s tests) - @(cd xsltproc ; $(MAKE) -s tests) -if WITH_PYTHON - @cd python && $(MAKE) tests -endif - -valgrind: - @echo '## Running the regression tests under Valgrind' - @echo '## Go get a cup of coffee it is gonna take a while ...' - @(cd tests ; $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests) - @(cd xsltproc ; $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests) - cleanup: -@(find . -name .\#\* -exec rm {} \;) diff --git a/configure.ac b/configure.ac index 4ceeacf1..0cf164d2 100644 --- a/configure.ac +++ b/configure.ac @@ -551,33 +551,11 @@ xsltproc/Makefile python/Makefile python/tests/Makefile tests/Makefile -tests/docs/Makefile -tests/REC1/Makefile -tests/REC2/Makefile -tests/REC/Makefile -tests/general/Makefile -tests/reports/Makefile -tests/extensions/Makefile -tests/namespaces/Makefile -tests/keys/Makefile -tests/numbers/Makefile -tests/documents/Makefile tests/xmlspec/Makefile tests/multiple/Makefile tests/xinclude/Makefile tests/XSLTMark/Makefile tests/docbook/Makefile -tests/exslt/Makefile -tests/exslt/common/Makefile -tests/exslt/functions/Makefile -tests/exslt/math/Makefile -tests/exslt/saxon/Makefile -tests/exslt/sets/Makefile -tests/exslt/strings/Makefile -tests/exslt/date/Makefile -tests/exslt/dynamic/Makefile -tests/exslt/crypto/Makefile -tests/plugins/Makefile tests/fuzz/Makefile doc/Makefile doc/devhelp/Makefile diff --git a/libxslt.spec.in b/libxslt.spec.in index ad34e3cb..722e5880 100644 --- a/libxslt.spec.in +++ b/libxslt.spec.in @@ -69,7 +69,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-python}-%{version} %check -make tests +make check %clean rm -fr %{buildroot} diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 9239d1dc..861151fc 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -8,7 +8,7 @@ TESTSPY = \ exampledir = $(docdir)/python/examples dist_example_DATA = test.xml test.xsl pyxsltproc.py $(TESTSPY) -tests: $(TESTSPY) +check-local: $(TESTSPY) @(export PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH"; \ export LD_LIBRARY_PATH="$(top_builddir)/libxslt/.libs:$(top_builddir)/libexslt/.libs:$$LD_LIBRARY_PATH"; \ export DYLD_LIBRARY_PATH="$(top_builddir)/libxslt/.libs:$(top_builddir)/libexslt/.libs:$$DYLD_LIBRARY_PATH"; \ @@ -23,8 +23,6 @@ tests: $(TESTSPY) echo "-- $$test" ; \ $(PYTHON) $(srcdir)/$$test; \ done) -else -tests: endif CLEANFILES = *.pyc core diff --git a/tests/Makefile.am b/tests/Makefile.am index 5645bb01..72ecabf1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,26 +1,53 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS=docs REC1 REC2 REC general namespaces keys numbers documents \ - extensions reports xmlspec multiple xinclude XSLTMark docbook \ - exslt plugins fuzz +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -all: +SUBDIRS = xmlspec multiple xinclude XSLTMark docbook fuzz + +DEPENDENCIES = $(top_builddir)/libxslt/libxslt.la \ + $(top_builddir)/libexslt/libexslt.la + +LDADD = $(top_builddir)/libxslt/libxslt.la \ + $(top_builddir)/libexslt/libexslt.la \ + $(LIBXML_LIBS) + +check_PROGRAMS = runtest + +runtest_SOURCES = runtest.c + +if WITH_MODULES -# Each subdirectory has it's own Makefile to cater for the unique -# requirements of that subdirectory. In general, xsltproc will be -# run on the *.xsl / *.xml file combinations, and the output of that -# run will be compared with the "expected" output contained in *.out -# and (if errors are expected) in *.err -test tests: - @(cur=`pwd` ; for dir in $(SUBDIRS) ; do cd $$dir ; $(MAKE) CHECKER='$(CHECKER)' tests ; cd $$cur ; done) +check_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la -valgrind: - @echo '## Running the regression tests under Valgrind' - @echo '## Go get a cup of coffee it is gonna take a while ...' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests +# our rpath is a rather unorthodox location as we +# don't want to pollute $(DESTDIR) with the test plugin + +plugindir = $(abs_builddir)/.libs + +xmlsoft_org_xslt_testplugin_la_CFLAGS = $(AM_CFLAGS) -DMODULE_COMPILE +xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c +xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) +xmlsoft_org_xslt_testplugin_la_LDFLAGS = \ + $(AM_LDFLAGS) -no-undefined \ + -module -avoid-version -rpath $(plugindir) + +endif + +all: -full: tests docbook_tests +check-local: + cd $(srcdir) && LIBXSLT_PLUGINS_PATH=$(plugindir) $(abs_builddir)/runtest docbook_tests: @(cd docbook ; $(MAKE) full) +dist-hook: + cp -a $(srcdir)/REC $(distdir) + cp -a $(srcdir)/REC2 $(distdir) + cp -a $(srcdir)/exslt $(distdir) + cp -a $(srcdir)/extensions $(distdir) + cp -a $(srcdir)/general $(distdir) + cp -a $(srcdir)/namespaces $(distdir) + cp -a $(srcdir)/numbers $(distdir) + cp -a $(srcdir)/plugins $(distdir) + cp -a $(srcdir)/reports $(distdir) diff --git a/tests/REC/Makefile.am b/tests/REC/Makefile.am deleted file mode 100644 index b0d943f2..00000000 --- a/tests/REC/Makefile.am +++ /dev/null @@ -1,219 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - article.xsl bigfont.xsl \ - test-10-1.out test-10-1.xml test-10-1.xsl \ - test-10-2.out test-10-2.xml test-10-2.xsl \ - test-11.2-1.out test-11.2-1.xml test-11.2-1.xsl \ - test-11.2-2.out test-11.2-2.xml test-11.2-2.xsl \ - test-11.2-3.out test-11.2-3.xml test-11.2-3.xsl \ - test-11.2-4.out test-11.2-4.xml test-11.2-4.xsl \ - test-11.2-5.out test-11.2-5.xml test-11.2-5.xsl \ - test-11.2-6.out test-11.2-6.xml test-11.2-6.xsl \ - test-12.2-1.out test-12.2-1.xml test-12.2-1.xsl \ - test-12.2-2.out test-12.2-2.xml test-12.2-2.xsl \ - test-15-1.out test-15-1.xml test-15-1.xsl \ - test-16.1-1.out test-16.1-1.xml test-16.1-1.xsl \ - test-16.1-2.out test-16.1-2.xml test-16.1-2.xsl \ - test-2.3-1.out test-2.3-1.xml test-2.3-1.xsl \ - test-2.3-2.out test-2.3-2.xml test-2.3-2.xsl \ - test-3.4-1.out test-3.4-1.xml test-3.4-1.xsl \ - test-3.4-2.out test-3.4-2.xml test-3.4-2.xsl \ - test-3.4-3.out test-3.4-3.xml test-3.4-3.xsl \ - test-2.5-1.out test-2.5-1.xml test-2.5-1.xsl test-2.5-1.err \ - test-2.6.2-1.out test-2.6.2-1.xml test-2.6.2-1.xsl \ - test-5.2-1.out test-5.2-1.xml test-5.2-1.xsl \ - test-5.2-2.out test-5.2-2.xml test-5.2-2.xsl \ - test-5.2-3.out test-5.2-3.xml test-5.2-3.xsl \ - test-5.2-4.out test-5.2-4.xml test-5.2-4.xsl \ - test-5.2-5.out test-5.2-5.xml test-5.2-5.xsl \ - test-5.2-6.out test-5.2-6.xml test-5.2-6.xsl \ - test-5.2-7.out test-5.2-7.xml test-5.2-7.xsl \ - test-5.2-8.out test-5.2-8.xml test-5.2-8.xsl \ - test-5.2-9.out test-5.2-9.xml test-5.2-9.xsl \ - test-5.2-10.out test-5.2-10.xml test-5.2-10.xsl \ - test-5.2-11.out test-5.2-11.xml test-5.2-11.xsl \ - test-5.2-12.out test-5.2-12.xml test-5.2-12.xsl \ - test-5.2-13.out test-5.2-13.xml test-5.2-13.xsl \ - test-5.2-14.out test-5.2-14.xml test-5.2-14.xsl \ - test-5.2-15.out test-5.2-15.xml test-5.2-15.xsl \ - test-5.2-16.out test-5.2-16.xml test-5.2-16.xsl \ - test-5.2-17.out test-5.2-17.xml test-5.2-17.xsl \ - test-5.2-18.out test-5.2-18.xml test-5.2-18.xsl \ - test-5.2-19.out test-5.2-19.xml test-5.2-19.xsl \ - test-5.2-20.out test-5.2-20.xml test-5.2-20.xsl \ - test-5.2-21.out test-5.2-21.xml test-5.2-21.xsl \ - test-5.2-22.out test-5.2-22.xml test-5.2-22.xsl \ - test-5.3.out test-5.3.xml test-5.3.xsl \ - test-5.4-1.out test-5.4-1.xml test-5.4-1.xsl \ - test-5.4-2.out test-5.4-2.xml test-5.4-2.xsl \ - test-5.4-3.out test-5.4-3.xml test-5.4-3.xsl \ - test-5.4-4.out test-5.4-4.xml test-5.4-4.xsl \ - test-5.4-5.out test-5.4-5.xml test-5.4-5.xsl \ - test-5.8.out test-5.8.xml test-5.8.xsl \ - test-6.out test-6.xml test-6.xsl \ - test-6.1.out test-6.1.xml test-6.1.xsl test-6.1.err \ - test-7.1.1.out test-7.1.1.xml test-7.1.1.xsl \ - test-7.1.1-2.out test-7.1.1-2.xml test-7.1.1-2.xsl \ - test-7.1.1-3.out test-7.1.1-3.xml test-7.1.1-3.xsl \ - test-7.1.3.out test-7.1.3.xml test-7.1.3.xsl \ - test-7.1.4.out test-7.1.4.xml test-7.1.4.xsl \ - test-7.3.out test-7.3.xml test-7.3.xsl \ - test-7.4.out test-7.4.xml test-7.4.xsl \ - test-7.5-1.out test-7.5-1.xml test-7.5-1.xsl \ - test-7.6.1-1.out test-7.6.1-1.xml test-7.6.1-1.xsl \ - test-7.6.1-2.out test-7.6.1-2.xml test-7.6.1-2.xsl \ - test-7.6.1-3.out test-7.6.1-3.xml test-7.6.1-3.xsl \ - test-7.6.2-1.out test-7.6.2-1.xml test-7.6.2-1.xsl \ - test-7.6.2-2.out test-7.6.2-2.xml test-7.6.2-2.xsl \ - test-7.7-1.out test-7.7-1.xml test-7.7-1.xsl \ - test-7.7-2.out test-7.7-2.xml test-7.7-2.xsl \ - test-7.7-3.out test-7.7-3.xml test-7.7-3.xsl \ - test-7.7-4.out test-7.7-4.xml test-7.7-4.xsl \ - test-7.7-5.out test-7.7-5.xml test-7.7-5.xsl \ - test-7.7-6.out test-7.7-6.xml test-7.7-6.xsl \ - test-8-1.out test-8-1.xml test-8-1.xsl \ - test-9.1-1.out test-9.1-1.xml test-9.1-1.xsl \ - test-9.1-2.out test-9.1-2.xml test-9.1-2.xsl \ - test-9.2-1.xsl \ - stand-2.7-1.dtd stand-2.7-1.stand.out stand-2.7-1.xsl \ - stand-2.7-1.out stand-2.7-1.xml \ - stand-2.7-2.stand.out stand-2.7-2.xml stand-2.7-3.xml \ - stand-2.7-3.stand.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @(echo > .memdump) - @echo '## Running REC tests' - -@(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then \ - continue ; \ - fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml \ - > $$name.res 2>$$name.bad ; \ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - cp $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -f $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad ; \ - else \ - diff /dev/null $$name.bad ; \ - fi ; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | \ - grep -v "MEMORY ALLOCATED : 0" || true` ; \ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) - @(for i in $(srcdir)/stand*.xml ; do \ - name=`basename $$i .xml` ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xml > $$name.res 2>$$name.bad ;\ - if [ ! -f $(srcdir)/$$name.stand.out ] ; then \ - cp $$name.res $(srcdir)/$$name.stand.out ; \ - if [ -s $$name.bad ] ; then \ - cp $$name.bad $(srcdir)/$$name.stand.err ; \ - fi ; \ - else \ - if [ ! -f $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.stand.out $$name.res ; \ - if [ -s $(srcdir)/$$name.stand.err ] ; then \ - diff $(srcdir)/$$name.stand.err $$name.bad ; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) - @echo '## Running REC tests without dictionaries' - -@(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then \ - continue ; \ - fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml \ - > $$name.res 2>$$name.bad ; \ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - cp $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -f $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad ; \ - else \ - diff /dev/null $$name.bad ; \ - fi ; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | \ - grep -v "MEMORY ALLOCATED : 0" || true` ; \ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) - @(for i in $(srcdir)/stand*.xml ; do \ - name=`basename $$i .xml` ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict \ - $(srcdir)/$$name.xml > $$name.res 2>$$name.bad ;\ - if [ ! -f $(srcdir)/$$name.stand.out ] ; then \ - cp $$name.res $(srcdir)/$$name.stand.out ; \ - if [ -s $$name.bad ] ; then \ - cp $$name.bad $(srcdir)/$$name.stand.err ; \ - fi ; \ - else \ - if [ ! -f $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.stand.out $$name.res ; \ - if [ -s $(srcdir)/$$name.stand.err ] ; then \ - diff $(srcdir)/$$name.stand.err $$name.bad ; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) - diff --git a/tests/REC/test-6.1.out b/tests/REC/test-6.1.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/REC/test-6.1.out +++ /dev/null diff --git a/tests/REC1/Makefile.am b/tests/REC1/Makefile.am deleted file mode 100644 index cd34f296..00000000 --- a/tests/REC1/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = doc.xsl doc.xml doc.dtd result.xml - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -# No special stuff here, just a single test that either works or doesn't! -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running REC1 tests' - @(echo > .memdump) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/doc.xsl $(srcdir)/doc.xml > doc.res ; \ - diff $(srcdir)/result.xml doc.res ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true; \ - rm -f doc.res) - diff --git a/tests/REC2/Makefile.am b/tests/REC2/Makefile.am deleted file mode 100644 index a075b90d..00000000 --- a/tests/REC2/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = data.xml vrml.xsl vrml.xml svg.xsl svg.xml html.xsl html.xml - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -# Just 3 specific files tested, they either work or don't! -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running REC2 tests' - @(echo > .memdump) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/vrml.xsl $(srcdir)/data.xml > vrml.res ; \ - diff $(srcdir)/vrml.xml vrml.res ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f vrml.res) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/svg.xsl $(srcdir)/data.xml > svg.res ; \ - diff $(srcdir)/svg.xml svg.res ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f svg.res) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/html.xsl $(srcdir)/data.xml > html.res ; \ - diff $(srcdir)/html.xml html.res ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f html.res) - diff --git a/tests/REC2/data.xml b/tests/REC2/data.xml deleted file mode 100644 index a5437417..00000000 --- a/tests/REC2/data.xml +++ /dev/null @@ -1,21 +0,0 @@ -<sales> - - <division id="North"> - <revenue>10</revenue> - <growth>9</growth> - <bonus>7</bonus> - </division> - - <division id="South"> - <revenue>4</revenue> - <growth>3</growth> - <bonus>4</bonus> - </division> - - <division id="West"> - <revenue>6</revenue> - <growth>-1.5</growth> - <bonus>2</bonus> - </division> - -</sales> diff --git a/tests/REC2/html.out b/tests/REC2/html.out new file mode 100644 index 00000000..94ed6c59 --- /dev/null +++ b/tests/REC2/html.out @@ -0,0 +1,32 @@ +<html lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Sales Results By Division</title> +</head> +<body><table border="1"> +<tr> +<th>Division</th> +<th>Revenue</th> +<th>Growth</th> +<th>Bonus</th> +</tr> +<tr> +<td><em>North</em></td> +<td>10</td> +<td>9</td> +<td>7</td> +</tr> +<tr> +<td><em>West</em></td> +<td>6</td> +<td style="color:red">-1.5</td> +<td>2</td> +</tr> +<tr> +<td><em>South</em></td> +<td>4</td> +<td>3</td> +<td>4</td> +</tr> +</table></body> +</html> diff --git a/tests/REC2/html.xml b/tests/REC2/html.xml index 94ed6c59..a5437417 100644 --- a/tests/REC2/html.xml +++ b/tests/REC2/html.xml @@ -1,32 +1,21 @@ -<html lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Sales Results By Division</title> -</head> -<body><table border="1"> -<tr> -<th>Division</th> -<th>Revenue</th> -<th>Growth</th> -<th>Bonus</th> -</tr> -<tr> -<td><em>North</em></td> -<td>10</td> -<td>9</td> -<td>7</td> -</tr> -<tr> -<td><em>West</em></td> -<td>6</td> -<td style="color:red">-1.5</td> -<td>2</td> -</tr> -<tr> -<td><em>South</em></td> -<td>4</td> -<td>3</td> -<td>4</td> -</tr> -</table></body> -</html> +<sales> + + <division id="North"> + <revenue>10</revenue> + <growth>9</growth> + <bonus>7</bonus> + </division> + + <division id="South"> + <revenue>4</revenue> + <growth>3</growth> + <bonus>4</bonus> + </division> + + <division id="West"> + <revenue>6</revenue> + <growth>-1.5</growth> + <bonus>2</bonus> + </division> + +</sales> diff --git a/tests/REC2/svg.out b/tests/REC2/svg.out new file mode 100644 index 00000000..fdaca227 --- /dev/null +++ b/tests/REC2/svg.out @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<svg xmlns="http://www.w3.org/Graphics/SVG/SVG-19990812.dtd" width="3in" height="3in"> + <g style="stroke: #000000"> + <line x1="0" x2="150" y1="150" y2="150"/> + <line x1="0" x2="0" y1="0" y2="150"/> + <text x="0" y="10">Revenue</text> + <text x="150" y="165">Division</text> + <rect x="10" y="50" width="20" height="100"/> + <text x="10" y="165">North</text> + <text x="10" y="45">10</text> + <rect x="50" y="110" width="20" height="40"/> + <text x="50" y="165">South</text> + <text x="50" y="105">4</text> + <rect x="90" y="90" width="20" height="60"/> + <text x="90" y="165">West</text> + <text x="90" y="85">6</text> + </g> +</svg> diff --git a/tests/REC2/svg.xml b/tests/REC2/svg.xml index fdaca227..a5437417 100644 --- a/tests/REC2/svg.xml +++ b/tests/REC2/svg.xml @@ -1,18 +1,21 @@ -<?xml version="1.0"?> -<svg xmlns="http://www.w3.org/Graphics/SVG/SVG-19990812.dtd" width="3in" height="3in"> - <g style="stroke: #000000"> - <line x1="0" x2="150" y1="150" y2="150"/> - <line x1="0" x2="0" y1="0" y2="150"/> - <text x="0" y="10">Revenue</text> - <text x="150" y="165">Division</text> - <rect x="10" y="50" width="20" height="100"/> - <text x="10" y="165">North</text> - <text x="10" y="45">10</text> - <rect x="50" y="110" width="20" height="40"/> - <text x="50" y="165">South</text> - <text x="50" y="105">4</text> - <rect x="90" y="90" width="20" height="60"/> - <text x="90" y="165">West</text> - <text x="90" y="85">6</text> - </g> -</svg> +<sales> + + <division id="North"> + <revenue>10</revenue> + <growth>9</growth> + <bonus>7</bonus> + </division> + + <division id="South"> + <revenue>4</revenue> + <growth>3</growth> + <bonus>4</bonus> + </division> + + <division id="West"> + <revenue>6</revenue> + <growth>-1.5</growth> + <bonus>2</bonus> + </division> + +</sales> diff --git a/tests/REC2/vrml.out b/tests/REC2/vrml.out new file mode 100644 index 00000000..c9ba69f5 --- /dev/null +++ b/tests/REC2/vrml.out @@ -0,0 +1,38 @@ +#VRML V2.0 utf8 + +# externproto definition of a single bar element +EXTERNPROTO bar [ + field SFInt32 x + field SFInt32 y + field SFInt32 z + field SFString name + ] + "http://www.vrml.org/WorkingGroups/dbwork/barProto.wrl" + +# inline containing the graph axes +Inline { + url "http://www.vrml.org/WorkingGroups/dbwork/barAxes.wrl" + } + + +bar { + x 10 + y 9 + z 7 + name "North" + } + +bar { + x 4 + y 3 + z 4 + name "South" + } + +bar { + x 6 + y -1.5 + z 2 + name "West" + } +
\ No newline at end of file diff --git a/tests/REC2/vrml.xml b/tests/REC2/vrml.xml index c9ba69f5..a5437417 100644 --- a/tests/REC2/vrml.xml +++ b/tests/REC2/vrml.xml @@ -1,38 +1,21 @@ -#VRML V2.0 utf8 - -# externproto definition of a single bar element -EXTERNPROTO bar [ - field SFInt32 x - field SFInt32 y - field SFInt32 z - field SFString name - ] - "http://www.vrml.org/WorkingGroups/dbwork/barProto.wrl" - -# inline containing the graph axes -Inline { - url "http://www.vrml.org/WorkingGroups/dbwork/barAxes.wrl" - } - - -bar { - x 10 - y 9 - z 7 - name "North" - } - -bar { - x 4 - y 3 - z 4 - name "South" - } - -bar { - x 6 - y -1.5 - z 2 - name "West" - } -
\ No newline at end of file +<sales> + + <division id="North"> + <revenue>10</revenue> + <growth>9</growth> + <bonus>7</bonus> + </division> + + <division id="South"> + <revenue>4</revenue> + <growth>3</growth> + <bonus>4</bonus> + </division> + + <division id="West"> + <revenue>6</revenue> + <growth>-1.5</growth> + <bonus>2</bonus> + </division> + +</sales> diff --git a/tests/XSLTMark/Makefile.am b/tests/XSLTMark/Makefile.am index 6932fef6..5ed2d73f 100644 --- a/tests/XSLTMark/Makefile.am +++ b/tests/XSLTMark/Makefile.am @@ -61,14 +61,10 @@ xsltproc = $(top_builddir)/xsltproc/xsltproc $(xsltproc): cd ../../xsltproc && $(MAKE) xsltproc -test tests: +check-local: @echo '## Running XSLTMark tests' @$(MAKE) $(ALL_TESTS) -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - CLEANFILES = *.tmp *~ .memdump core db100.xml db1000.xml db10000.xml @@ -740,4 +736,4 @@ depth: $(xsltproc) fi @rm -f $@.tmp -.PHONY: test tests valgrind $(ALL_TESTS) +.PHONY: $(ALL_TESTS) diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am index 83b1be3c..71ba0644 100644 --- a/tests/docbook/Makefile.am +++ b/tests/docbook/Makefile.am @@ -1,13 +1,9 @@ ## Process this file with automake to produce Makefile.in -tests: +check-local: @$(MAKE) single @$(MAKE) xtchunk -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - $(top_builddir)/xsltproc/xsltproc: @(cd ../../xsltproc ; $(MAKE) xsltproc) diff --git a/tests/docs/Makefile.am b/tests/docs/Makefile.am deleted file mode 100644 index e45acfd6..00000000 --- a/tests/docs/Makefile.am +++ /dev/null @@ -1,228 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# -# Contains only test documents -# - -EXTRA_DIST = \ - bug-1-.xml \ - bug-2-.xml \ - bug-3-.xml \ - bug-4-.xml \ - bug-5-.xml \ - bug-6-.xml \ - bug-7-.xml \ - bug-8-.xml \ - bug-9-.xml \ - bug-10-.xml \ - bug-11-.xml \ - bug-12-.xml \ - bug-13-.xml \ - bug-14-.xml \ - bug-15-.xml \ - bug-16-.xml \ - bug-17-.xml \ - bug-18-.xml \ - bug-19-.xml \ - bug-20-.xml \ - bug-21-.xml \ - bug-22-.xml \ - bug-23-.xml \ - bug-24-.xml \ - bug-25-.xml \ - bug-26-.xml \ - bug-27-.xml \ - bug-28-.xml \ - bug-29-.xml bug-29-.ent \ - bug-30-.xml \ - bug-31-.xml \ - bug-32-.xml \ - bug-33-.xml \ - bug-35-.xml \ - bug-36-.xml \ - bug-37-.xml \ - bug-38-.xml \ - bug-39-.xml \ - bug-40-.xml \ - bug-41-.xml \ - bug-42-.xml \ - bug-43-.xml \ - bug-44-.xml \ - bug-45-.xml \ - bug-46-.xml \ - bug-47-.xml \ - bug-48-.xml \ - bug-49-.xml \ - bug-50-.xml \ - bug-52.xml \ - bug-53.xml \ - bug-54.xml \ - bug-55.xml \ - bug-56.xml \ - bug-57.xml \ - bug-59.xml \ - bug-60.xml \ - bug-61.xml \ - bug-62.xml \ - bug-63.xml \ - bug-64.xml \ - bug-65.xml \ - bug-66.xml \ - bug-68.xml \ - bug-69.xml \ - bug-70.xml \ - bug-71.xml \ - bug-72.xml \ - bug-73.xml \ - bug-74.xml \ - bug-75.xml \ - bug-76.xml \ - bug-77.xml \ - bug-78.xml \ - bug-79.xml \ - bug-80.xml \ - bug-81.xml \ - bug-82.xml \ - bug-83.xml \ - bug-84.xml \ - bug-86.xml \ - bug-87.xml \ - bug-88.xml \ - bug-89.xml \ - bug-90.xml \ - bug-91.xml \ - bug-92.xml \ - bug-93.xml \ - bug-94.xml \ - bug-95.xml \ - bug-96.xml \ - bug-97.xml \ - bug-98.xml \ - bug-99.xml \ - bug-100.xml \ - bug-101.xml \ - bug-102.xml \ - bug-103.xml \ - bug-104.xml \ - bug-105.xml \ - bug-106.xml \ - bug-107.xml \ - bug-108.xml \ - bug-109.xml \ - bug-110.xml bug-110.ent \ - bug-111.xml \ - bug-112.xml \ - bug-113.xml \ - bug-114.xml \ - bug-115.xml \ - bug-116.xml \ - bug-117.xml \ - bug-118.xml \ - bug-119.xml \ - bug-120.xml \ - bug-121.xml \ - bug-122.xml \ - bug-123.xml \ - bug-124.xml \ - bug-125.xml \ - bug-126.xml \ - bug-127.xml \ - bug-128.xml \ - bug-129.xml \ - bug-130.xml bug-130.doc \ - bug-131.xml \ - bug-132.xml \ - bug-133.xml \ - bug-134.xml \ - bug-135.xml \ - bug-136.xml \ - bug-137.xml \ - bug-138.xml \ - bug-139.xml \ - bug-140.xml \ - bug-141.xml \ - bug-142.xml \ - bug-143.xml \ - bug-144.xml \ - bug-145.xml \ - bug-146.xml \ - bug-147.xml \ - bug-148.xml \ - bug-149.xml \ - bug-150.xml \ - bug-151.xml \ - bug-152.xml \ - bug-153.xml bug-153.doc \ - bug-154.xml \ - bug-155.xml \ - bug-156.xml \ - bug-157.xml \ - bug-158.xml bug-158.doc \ - bug-159.xml \ - bug-160.xml \ - bug-161.xml \ - bug-163.xml \ - bug-164.xml \ - bug-165.xml \ - bug-166.xml \ - bug-167.xml \ - bug-168.xml \ - bug-169.xml \ - bug-170.xml \ - bug-171.xml \ - bug-172.xml \ - bug-173.xml \ - bug-174.xml \ - bug-175.xml \ - bug-176.xml \ - bug-177.xml \ - bug-178.xml \ - bug-179.xml \ - bug-180.xml \ - bug-181.xml \ - bug-182.xml \ - bug-183.xml \ - bug-184.xml \ - bug-186.xml \ - bug-187.xml \ - bug-188.xml \ - bug-189.xml \ - bug-190.xml \ - bug-191.xml \ - bug-192.xml \ - bug-193.xml \ - bug-194.xml \ - bug-195.xml \ - bug-196.xml \ - bug-197.xml \ - bug-198.xml \ - bug-199.xml \ - bug-200.xml \ - bug-201.xml \ - bug-202.xml \ - bug-203.xml \ - bug-204.xml \ - bug-205.xml \ - bug-206.xml \ - bug-207.xml \ - bug-208.xml \ - bug-209.xml \ - bug-210.xml \ - bug-211.xml \ - bug-212.xml \ - bug-213.xml \ - bug-214.xml \ - bug-215.xml \ - bug-216.xml \ - bug-217.xml \ - bug-218.xml \ - bug-219.xml \ - bug-220.xml \ - bug-221.xml \ - bug-222.xml \ - character.xml \ - date_add.xml \ - array.xml \ - items.xml - -tests: diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am deleted file mode 100644 index 97c9fd8d..00000000 --- a/tests/documents/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - bredfort.css bredfort.xsl doc_file.xml docfile.xml \ - fragment2.xml fragment.result fragment.xml fragment.xsl \ - index.xml menu.xml message.result message.xml message.xsl \ - result.xhtml system.xml test_bad.err test_bad.result \ - test_bad.xml test.result test.xml test.xsl worklog.xml - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @(echo > .memdump) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/bredfort.xsl $(srcdir)/index.xml > result ; \ - diff $(srcdir)/result.xhtml result; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f result) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/test.xsl $(srcdir)/test.xml > result ; \ - diff $(srcdir)/test.result result; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f result) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/test.xsl $(srcdir)/test_bad.xml > result 2>err ; \ - diff $(srcdir)/test_bad.result result; \ - diff $(srcdir)/test_bad.err err; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f result err) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/message.xsl $(srcdir)/message.xml > result 2>&1 ; \ - diff $(srcdir)/message.result result; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f result) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/fragment.xsl $(srcdir)/fragment.xml > result 2>&1 ; \ - diff $(srcdir)/fragment.result result; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f result) - diff --git a/tests/documents/result.xhtml b/tests/documents/bredfort.out index f02fbb88..f02fbb88 100644 --- a/tests/documents/result.xhtml +++ b/tests/documents/bredfort.out diff --git a/tests/documents/index.xml b/tests/documents/bredfort.xml index 3ca2af32..3ca2af32 100644 --- a/tests/documents/index.xml +++ b/tests/documents/bredfort.xml diff --git a/tests/documents/fragment.result b/tests/documents/fragment.out index 2c4565b4..2c4565b4 100644 --- a/tests/documents/fragment.result +++ b/tests/documents/fragment.out diff --git a/tests/documents/message.result b/tests/documents/message.err index 965a84b4..965a84b4 100644 --- a/tests/documents/message.result +++ b/tests/documents/message.err diff --git a/tests/documents/test.result b/tests/documents/test.out index faa008cc..faa008cc 100644 --- a/tests/documents/test.result +++ b/tests/documents/test.out diff --git a/tests/documents/test_bad.err b/tests/documents/test_bad.err index 52e8b02c..e2ec793e 100644 --- a/tests/documents/test_bad.err +++ b/tests/documents/test_bad.err @@ -1,2 +1,2 @@ -warning: failed to load external entity "foofile.xml" -warning: failed to load external entity "foo_file.xml" +I/O warning : failed to load external entity "foofile.xml" +I/O warning : failed to load external entity "foo_file.xml" diff --git a/tests/documents/test_bad.result b/tests/documents/test_bad.out index 2b636bfb..2b636bfb 100644 --- a/tests/documents/test_bad.result +++ b/tests/documents/test_bad.out diff --git a/tests/documents/test_bad.xsl b/tests/documents/test_bad.xsl new file mode 100644 index 00000000..5c5aab09 --- /dev/null +++ b/tests/documents/test_bad.xsl @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0"> +<xsl:output method="text" encoding="iso-8859-1"/> + +<xsl:template match="/files/file"> + <xsl:variable name="file" select="document(@name)"/> + <xsl:if test="not($file)"> + <xsl:text>Can't Open File: </xsl:text> + <xsl:value-of select="@name"/> + </xsl:if> + <xsl:value-of select="$file/tag1"/> +</xsl:template> + +</xsl:stylesheet> diff --git a/tests/exslt/Makefile.am b/tests/exslt/Makefile.am deleted file mode 100644 index 9f20a725..00000000 --- a/tests/exslt/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS=common functions math saxon sets strings dynamic date $(CRYPTO_TESTDIR) -DIST_SUBDIRS = common functions math saxon sets strings dynamic date crypto - -test tests: - @(cur=`pwd` ; for dir in $(SUBDIRS) ; do cd $$dir ; $(MAKE) CHECKER='$(CHECKER)' tests ; cd $$cur ; done) - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - diff --git a/tests/exslt/common/Makefile.am b/tests/exslt/common/Makefile.am deleted file mode 100644 index 5b5895cb..00000000 --- a/tests/exslt/common/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - node-set.1.xml node-set.1.xsl node-set.1.out \ - node-set.2.xml node-set.2.xsl node-set.2.out \ - node-set.3.xml node-set.3.xsl node-set.3.out \ - node-set.4.xml node-set.4.xsl node-set.4.out \ - node-set.5.xml node-set.5.xsl node-set.5.out \ - node-set.6.xml node-set.6.xsl node-set.6.out \ - node-set.7.xml node-set.7.xsl node-set.7.out \ - node-set.8.xml node-set.8.xsl node-set.8.out \ - object-type.1.xml object-type.1.xsl object-type.1.out \ - import-test1a.imp import-test1b.imp import-test1.out \ - import-test1.xml import-test1.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt common tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad; \ - done) diff --git a/tests/exslt/crypto/Makefile.am b/tests/exslt/crypto/Makefile.am deleted file mode 100644 index 0edb15bf..00000000 --- a/tests/exslt/crypto/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - crypt.1.out crypt.1.xml crypt.1.xsl \ - hash.1.out hash.1.xml hash.1.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt crypto tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/date/Makefile.am b/tests/exslt/date/Makefile.am deleted file mode 100644 index fae16ab7..00000000 --- a/tests/exslt/date/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - current.xsl \ - date.1.out date.1.xml date.1.xsl \ - date.2.out date.2.xml date.2.xsl \ - datetime.1.out datetime.1.xml datetime.1.xsl \ - datetime.2.out datetime.2.xml datetime.2.xsl \ - gday.1.out gday.1.xml gday.1.xsl \ - gday.2.out gday.2.xml gday.2.xsl \ - gmonth.1.out gmonth.1.xml gmonth.1.xsl \ - gmonth.2.out gmonth.2.xml gmonth.2.xsl \ - gmonthday.1.out gmonthday.1.xml gmonthday.1.xsl \ - gmonthday.2.out gmonthday.2.xml gmonthday.2.xsl \ - gyear.1.out gyear.1.xml gyear.1.xsl \ - gyear.2.out gyear.2.xml gyear.2.xsl \ - gyearmonth.1.out gyearmonth.1.xml gyearmonth.1.xsl \ - gyearmonth.2.out gyearmonth.2.xml gyearmonth.2.xsl \ - time.1.out time.1.xml time.1.xsl \ - time.2.out time.2.xml time.2.xsl \ - add.1.out add.1.xml add.1.xsl \ - add.2.out add.2.xml add.2.xsl \ - add-duration.1.out add-duration.1.xml add-duration.1.xsl \ - add-duration.2.out add-duration.2.xml add-duration.2.xsl \ - sum.1.out sum.1.xml sum.1.xsl \ - sum.2.out sum.2.xml sum.2.xsl sum.2.err \ - difference.1.out difference.1.xml difference.1.xsl \ - difference.2.out difference.2.xml difference.2.xsl \ - duration.1.out duration.1.xml duration.1.xsl \ - duration.2.out duration.2.xml duration.2.xsl \ - seconds.1.out seconds.1.xml seconds.1.xsl \ - seconds.2.out seconds.2.xml seconds.2.xsl - -CLEANFILES = .memdump - -test-current: - @(echo > .memdump) - @(if [ -z "$$CI" ]; then \ - echo \<doc/\> >current.xml ; \ - echo "#" ; \ - echo "# Inspect the following for correctness" ; \ - echo "#" ; \ - for i in $(srcdir)/current.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - done ; \ - rm -f current.xml ; \ - fi) - -test tests: $(top_builddir)/xsltproc/xsltproc test-current - @echo '## Running exslt date tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad; \ - done) diff --git a/tests/exslt/date/sum.2.err b/tests/exslt/date/sum.2.err deleted file mode 100644 index e69de29b..00000000 --- a/tests/exslt/date/sum.2.err +++ /dev/null diff --git a/tests/exslt/dynamic/Makefile.am b/tests/exslt/dynamic/Makefile.am deleted file mode 100644 index 0100dc9f..00000000 --- a/tests/exslt/dynamic/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - dynmap.out \ - dynmap.xml \ - dynmap.xsl \ - recursion.err \ - recursion.out \ - recursion.xml \ - recursion.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt dynamic tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/functions/Makefile.am b/tests/exslt/functions/Makefile.am deleted file mode 100644 index 3241284e..00000000 --- a/tests/exslt/functions/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - function.1.out function.1.xml function.1.xsl \ - function.2.out function.2.xml function.2.xsl \ - function.3.out function.3.xml function.3.xsl \ - function.4.out function.4.xml function.4.xsl \ - function.5.out function.5.xml function.5.xsl \ - function.6.out function.6.xml function.6.xsl \ - function.7.out function.7.xml function.7.xsl \ - function.8.out function.8.xml function.8.xsl \ - function.9.out function.9.xml function.9.xsl \ - function.10.out function.10.xml function.10.xsl \ - function.11.out function.11.xml function.11.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt function tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/math/Makefile.am b/tests/exslt/math/Makefile.am deleted file mode 100644 index 68bea6a1..00000000 --- a/tests/exslt/math/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - highest.1.out highest.1.xml highest.1.xsl \ - highest.2.out highest.2.xml highest.2.xsl \ - highest.5.out highest.5.xml highest.5.xsl \ - lowest.1.out lowest.1.xml lowest.1.xsl \ - lowest.2.out lowest.2.xml lowest.2.xsl \ - max.1.out max.1.xml max.1.xsl \ - max.2.out max.2.xml max.2.xsl \ - max.3.out max.3.xml max.3.xsl \ - max.5.out max.5.xml max.5.xsl \ - power.1.out power.1.xml power.1.xsl \ - min.1.out min.1.xml min.1.xsl \ - min.2.out min.2.xml min.2.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt math tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/saxon/Makefile.am b/tests/exslt/saxon/Makefile.am deleted file mode 100644 index 3ef3a2ca..00000000 --- a/tests/exslt/saxon/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - eval.1.out eval.1.xml eval.1.xsl \ - eval.2.out eval.2.xml eval.2.xsl eval.2.err \ - eval.3.out eval.3.xml eval.3.xsl eval.3.err \ - lineno.1.out lineno.1.xml lineno.1.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt saxon tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/saxon/eval.2.out b/tests/exslt/saxon/eval.2.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/exslt/saxon/eval.2.out +++ /dev/null diff --git a/tests/exslt/saxon/eval.3.out b/tests/exslt/saxon/eval.3.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/exslt/saxon/eval.3.out +++ /dev/null diff --git a/tests/exslt/sets/Makefile.am b/tests/exslt/sets/Makefile.am deleted file mode 100644 index 2f77c2dc..00000000 --- a/tests/exslt/sets/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - difference.1.out difference.1.xml difference.1.xsl \ - distinct.1.out distinct.1.xml distinct.1.xsl \ - has-same-node.1.out has-same-node.1.xml has-same-node.1.xsl \ - leading.1.out leading.1.xml leading.1.xsl \ - trailing.1.out trailing.1.xml trailing.1.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt sets tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/exslt/strings/Makefile.am b/tests/exslt/strings/Makefile.am deleted file mode 100644 index 0fa3aeb6..00000000 --- a/tests/exslt/strings/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - align.1.xml align.1.xsl align.1.out \ - padding.1.xml padding.1.xsl padding.1.out \ - replace.1.xml replace.1.xsl replace.1.out \ - split.1.xml split.1.xsl split.1.out \ - tokenize.1.xml tokenize.1.xsl tokenize.1.out \ - tokenize.2.xml tokenize.2.xsl tokenize.2.out \ - tokenize.3.xml tokenize.3.xsl tokenize.3.out \ - uri.xml uri.xsl uri.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running exslt string tests' - @(echo > .memdump) - @(for i in $(srcdir)/*.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\ - if [ ! -f $(srcdir)/$$name.out ] ; then \ - cp $$name.res $(srcdir)/$$name.out ; \ - if [ -s $$name.bad ] ; then \ - mv $$name.bad $(srcdir)/$$name.err ; \ - fi ; \ - else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ - fi ; \ - fi; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f $$name.res $$name.bad ; \ - done) diff --git a/tests/extensions/Makefile.am b/tests/extensions/Makefile.am deleted file mode 100644 index 06ac2368..00000000 --- a/tests/extensions/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - evaluate.xml evaluate.xsl evaluate.out \ - module.xml module.xsl module.out \ - list.xml list.xsl list.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running extensions tests' - @(echo > .memdump) - -@(for i in $(srcdir)/*.xml ; do \ - if [ -d $$i ] ; then continue ; fi ; \ - doc=`basename $$i .xml` ; \ - j=$(srcdir)/$$doc*.xsl ; \ - if [ ! -f $$j ] ; then continue ; fi ; \ - if [ -d $$j ] ; then continue ; fi ; \ - name=`basename $$j .xsl`; \ - out=$(srcdir)/"$$name".out; \ - err=$(srcdir)/"$$name".err; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \ - > result.$$name 2>err.$$name; \ - if [ ! -f $$out ] ; then \ - cp result.$$name $$out ; \ - if [ -s err.$$name ] ; then \ - cp err.$$name $$err ; \ - fi ; \ - else \ - diff $$out result.$$name; \ - if [ -s $$err ] ; then \ - diff $$err err.$$name; \ - else \ - diff /dev/null err.$$name; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f result.$$name err.$$name; \ - done) - diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am index 372d2c5d..006e6215 100644 --- a/tests/fuzz/Makefile.am +++ b/tests/fuzz/Makefile.am @@ -24,11 +24,9 @@ $(top_builddir)/libxslt/libxslt.la: $(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la cd $(top_builddir)/libexslt && $(MAKE) libexslt.la -.PHONY: tests fuzz-xpath fuzz-xslt +.PHONY: fuzz-xpath fuzz-xslt -tests: - -fuzz: $(check_PROGRAMS) +check-local: $(check_PROGRAMS) @echo '## Running fuzz target tests' @./testTargets $(srcdir) diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am deleted file mode 100644 index b394489d..00000000 --- a/tests/general/Makefile.am +++ /dev/null @@ -1,310 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - bug-1-.out bug-1-.xsl \ - bug-2-.out bug-2-.xsl \ - bug-3-.out bug-3-.xsl \ - bug-4-.out bug-4-.xsl \ - bug-5-.out bug-5-.xsl \ - bug-6-.out bug-6-.xsl \ - bug-7-.out bug-7-.xsl \ - bug-8-.out bug-8-.xsl \ - bug-9-.out bug-9-.xsl \ - bug-10-.out bug-10-.xsl \ - bug-11-.out bug-11-.xsl \ - bug-12-.out bug-12-.xsl \ - bug-13-.out bug-13-.xsl \ - bug-14-.out bug-14-.xsl \ - bug-15-.out bug-15-.xsl \ - bug-16-.out bug-16-.xsl \ - bug-17-.out bug-17-.xsl \ - bug-18-.out bug-18-.xsl \ - bug-19-.out bug-19-.xsl \ - bug-20-.out bug-20-.xsl \ - bug-21-.out bug-21-.xsl \ - bug-22-.out bug-22-.xsl \ - bug-23-.out bug-23-.xsl \ - bug-24-.out bug-24-.xsl \ - bug-25-.out bug-25-.xsl \ - bug-26-.out bug-26-.xsl \ - bug-27-.out bug-27-.xsl \ - bug-28-.out bug-28-.xsl \ - bug-29-.out bug-29-.xsl \ - bug-30-.out bug-30-.xsl \ - bug-31-.out bug-31-.xsl \ - bug-32-.out bug-32-.xsl \ - bug-33-.out bug-33-.xsl \ - bug-35-.out bug-35-.xsl \ - bug-36-.out bug-36-.xsl \ - bug-36-inc.out bug-36-inc.xsl \ - bug-37-.out bug-37-.xsl \ - bug-37-inc.out bug-37-inc.xsl \ - array.out array.xsl \ - bug-38-.out bug-38-.xsl \ - bug-39-.out bug-39-.xsl \ - bug-40-.out bug-40-.xsl \ - bug-41-.out bug-41-.xsl \ - bug-42-.out bug-42-.xsl \ - bug-43-.out bug-43-.xsl \ - bug-44-.out bug-44-.xsl \ - bug-45-.out bug-45-.xsl \ - bug-46-.out bug-46-.xsl \ - bug-47-.out bug-47-.xsl \ - bug-48-.out bug-48-.xsl \ - bug-49-.out bug-49-.xsl \ - bug-50-.out bug-50-.xsl \ - bug-52.out bug-52.xsl \ - bug-53.out bug-53.xsl \ - bug-54.out bug-54.xsl \ - bug-55.out bug-55.xsl \ - bug-56.out bug-56.xsl \ - bug-57.out bug-57.xsl \ - bug-59.out bug-59.xsl \ - bug-60.out bug-60.xsl bug-60.err \ - bug-61.out bug-61.xsl \ - bug-62-inc.out bug-62-inc.xsl \ - bug-62.out bug-62.xsl \ - bug-63.out bug-63.xsl \ - bug-64.out bug-64.xsl \ - bug-65.ent bug-65.out bug-65.xsl \ - bug-66.out bug-66.xsl \ - bug-68.out bug-68.xsl \ - bug-69.out bug-69.xsl \ - bug-70.out bug-70.xsl \ - bug-71.out bug-71.xsl \ - bug-72.out bug-72.xsl \ - bug-73.out bug-73.xsl \ - bug-74.out bug-74.xsl \ - bug-75.out bug-75.xsl \ - bug-76.out bug-76.xsl \ - bug-77.out bug-77.xsl \ - bug-78.out bug-78.xsl \ - bug-79.out bug-79.xsl \ - bug-80.out bug-80.xsl \ - bug-81.out bug-81.xsl \ - bug-82.out bug-82.xsl \ - bug-83.out bug-83.xsl \ - bug-84.out bug-84.xsl \ - bug-86.out bug-86.xsl \ - bug-87.out bug-87.xsl \ - bug-88.out bug-88.xsl \ - bug-89.out bug-89.xsl \ - bug-90.out bug-90.xsl \ - bug-91.out bug-91.xsl \ - bug-92.out bug-92.xsl \ - bug-93.out bug-93.xsl \ - bug-93-inc.out bug-93-inc.xsl \ - bug-94.out bug-94.xsl \ - bug-95.out bug-95.xsl \ - bug-96.out bug-96.xsl \ - bug-97.out bug-97.xsl \ - bug-98.out bug-98.xsl \ - bug-99.out bug-99.xsl \ - bug-100.out bug-100.xsl \ - bug-101.out bug-101.xsl \ - bug-102.out bug-102.xsl \ - bug-102-inc.out bug-102-inc.xsl \ - bug-103.out bug-103.xsl \ - bug-104.out bug-104.xsl \ - bug-105.out bug-105.xsl \ - bug-106.out bug-106.xsl \ - bug-107.out bug-107.xsl \ - bug-108.out bug-108.xsl \ - bug-109.out bug-109.xsl \ - bug-110.out bug-110.xsl bug-110.err \ - bug-111.out bug-111.xsl \ - bug-112.out bug-112.xsl \ - bug-113.out bug-113.xsl \ - bug-114.out bug-114.xsl \ - bug-115.out bug-115.xsl \ - bug-116.out bug-116.xsl \ - bug-117.out bug-117.xsl \ - bug-118.out bug-118.xsl \ - bug-119.out bug-119.xsl \ - bug-120.out bug-120.xsl \ - bug-121.out bug-121.xsl \ - bug-122.out bug-122.xsl \ - bug-123.out bug-123.xsl \ - bug-124.out bug-124.xsl \ - bug-125.out bug-125.xsl \ - bug-126.out bug-126.xsl \ - bug-127.out bug-127.xsl \ - bug-128.out bug-128.xsl \ - bug-129.out bug-129.xsl \ - bug-130.out bug-130.xsl \ - bug-130-imp1.imp bug-130-imp2.imp bug-130-imp3.imp bug-130-imp4.imp \ - bug-131.out bug-131.xsl bug-131-imp.imp \ - bug-132.out bug-132.xsl \ - bug-133.out bug-133.xsl \ - bug-134.out bug-134.xsl \ - bug-135.out bug-135.xsl \ - bug-136.out bug-136.xsl \ - bug-137.imp bug-137.out bug-137.xsl \ - bug-138.out bug-138.xsl \ - bug-139.out bug-139.xsl \ - bug-140.out bug-140.xsl \ - bug-141.out bug-141.xsl \ - bug-142.out bug-142.xsl \ - bug-143.out bug-143.xsl \ - bug-144.out bug-144.xsl \ - bug-145.out bug-145.xsl bug-145.err \ - bug-146.out bug-146.xsl \ - bug-147.out bug-147.xsl \ - bug-147-1.imp bug-147-2.imp bug-147-3.imp \ - bug-147-4.imp bug-147-5.imp bug-147-6.imp \ - bug-148.out bug-148.xsl \ - bug-149.out bug-149.xsl \ - bug-150.out bug-150.xsl \ - bug-151.out bug-151.xsl \ - bug-152.out bug-152.xsl \ - bug-153.out bug-153.xsl \ - bug-154.out bug-154.xsl \ - bug-155.out bug-155.xsl \ - bug-156.err bug-156.out bug-156.xsl \ - bug-156.imp1.imp bug-156.imp2.imp \ - bug-157.err bug-157.out bug-157.xsl \ - bug-158.out bug-158.xsl \ - bug-159.out bug-159.xsl \ - bug-160.out bug-160.xsl \ - bug-161.out bug-161.xsl \ - bug-163.out bug-163.xsl \ - bug-164.out bug-164.xsl \ - bug-165.out bug-165.xsl bug-165.err \ - bug-166.out bug-166.xsl \ - bug-167.out bug-167.xsl \ - bug-168.out bug-168.xsl \ - bug-169.out bug-169.xsl bug-169.imp \ - bug-170.out bug-170.xsl \ - bug-171.out bug-171.xsl \ - bug-172.out bug-172.xsl \ - bug-173.out bug-173.xsl \ - bug-174.out bug-174.xsl bug-174.err \ - bug-175.out bug-175.xsl bug-175.err \ - bug-176.out bug-176.xsl \ - bug-177.out bug-177.xsl \ - bug-178.out bug-178.xsl \ - bug-179.out bug-179.xsl \ - bug-180.out bug-180.xsl bug-180.err \ - bug-181.out bug-181.xsl \ - bug-182.out bug-182.xsl \ - bug-183.out bug-183.xsl \ - bug-184.out bug-184.xsl bug-184.err \ - bug-186.out bug-186.xsl \ - bug-187.out bug-187.xsl bug-187.err \ - bug-188.out bug-188.xsl bug-188-imp.out bug-188-imp.xsl \ - bug-189.out bug-189.xsl \ - bug-190.out bug-190.xsl bug-190-imp.out bug-190-imp.xsl \ - bug-191.out bug-191.xsl bug-191.err bug-191-imp.out bug-191-imp.xsl \ - bug-192.out bug-192.xsl \ - bug-193.out bug-193.xsl \ - bug-194.out bug-194.xsl bug-194.err \ - bug-195.out bug-195.xsl \ - bug-196.out bug-196.xsl \ - bug-197.out bug-197.xsl \ - bug-198.out bug-198.xsl \ - bug-199.out bug-199.xsl \ - bug-200.out bug-200.xsl \ - bug-201.out bug-201.xsl bug-201.err \ - bug-202.out bug-202.xsl bug-202.err \ - bug-203.out bug-203.xsl bug-203.err \ - bug-204.out bug-204.xsl bug-204.err \ - bug-205.out bug-205.xsl \ - bug-206.out bug-206.xsl \ - bug-207.out bug-207.xsl \ - bug-208.out bug-208.xsl bug-208.err \ - bug-209.out bug-209.xsl \ - bug-210.out bug-210.xsl \ - bug-211.out bug-211.xsl \ - bug-212.out bug-212.xsl \ - bug-213.out bug-213.xsl \ - bug-214.out bug-214.xsl \ - bug-215.out bug-215.xsl bug-215.err \ - bug-216.out bug-216.xsl \ - bug-217.out bug-217.xsl \ - bug-218.out bug-218.xsl \ - bug-219.out bug-219.xsl \ - bug-220.out bug-220.xsl \ - bug-221.out bug-221.xsl \ - bug-222.out bug-222.xsl \ - character.out character.xsl \ - character2.out character2.xsl \ - itemschoose.out itemschoose.xsl \ - inner.xsl \ - date_add.out date_add.xsl - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running general tests' - @(echo > .memdump) - -@(for i in $(srcdir)/../docs/*.xml ; do \ - if [ -d $$i ] ; then continue ; fi ; \ - doc=`basename $$i .xml` ; \ - for j in $(srcdir)/$$doc*.xsl ; do \ - if [ ! -f $$j ] ; then continue ; fi ; \ - if [ -d $$j ] ; then continue ; fi ; \ - name=`basename $$j .xsl`; \ - out=$(srcdir)/"$$name".out; \ - err=$(srcdir)/"$$name".err; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --maxdepth 200 $$j $$i \ - > result.$$name 2>err.$$name; \ - if [ ! -f $$out ] ; then \ - cp result.$$name $$out ; \ - if [ -s err.$$name ] ; then \ - cp err.$$name $$err ; \ - fi ; \ - else \ - diff $$out result.$$name; \ - if [ -s $$err ] ; then \ - diff $$err err.$$name; \ - else \ - diff /dev/null err.$$name; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f result.$$name err.$$name; \ - done ; done) - @echo '## Running general tests without dictionaries' - -@(for i in $(srcdir)/../docs/*.xml ; do \ - if [ -d $$i ] ; then continue ; fi ; \ - doc=`basename $$i .xml` ; \ - for j in $(srcdir)/$$doc*.xsl ; do \ - if [ ! -f $$j ] ; then continue ; fi ; \ - if [ -d $$j ] ; then continue ; fi ; \ - name=`basename $$j .xsl`; \ - out=$(srcdir)/"$$name".out; \ - err=$(srcdir)/"$$name".err; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict --maxdepth 200 $$j $$i \ - > result.$$name 2>err.$$name; \ - if [ ! -f $$out ] ; then \ - cp result.$$name $$out ; \ - if [ -s err.$$name ] ; then \ - cp err.$$name $$err ; \ - fi ; \ - else \ - diff $$out result.$$name; \ - if [ -s $$err ] ; then \ - diff $$err err.$$name; \ - else \ - diff /dev/null err.$$name; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f result.$$name err.$$name; \ - done ; done) - diff --git a/tests/docs/array.xml b/tests/general/array.xml index f850b64e..f850b64e 100644 --- a/tests/docs/array.xml +++ b/tests/general/array.xml diff --git a/tests/docs/bug-1-.xml b/tests/general/bug-1-.xml index cc677f79..cc677f79 100644 --- a/tests/docs/bug-1-.xml +++ b/tests/general/bug-1-.xml diff --git a/tests/docs/bug-10-.xml b/tests/general/bug-10-.xml index f3810665..f3810665 100644 --- a/tests/docs/bug-10-.xml +++ b/tests/general/bug-10-.xml diff --git a/tests/docs/bug-100.xml b/tests/general/bug-100.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-100.xml +++ b/tests/general/bug-100.xml diff --git a/tests/docs/bug-101.xml b/tests/general/bug-101.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-101.xml +++ b/tests/general/bug-101.xml diff --git a/tests/docs/bug-102.xml b/tests/general/bug-102.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-102.xml +++ b/tests/general/bug-102.xml diff --git a/tests/docs/bug-103.xml b/tests/general/bug-103.xml index f1999f80..f1999f80 100644 --- a/tests/docs/bug-103.xml +++ b/tests/general/bug-103.xml diff --git a/tests/docs/bug-104.xml b/tests/general/bug-104.xml index 59f90f79..59f90f79 100644 --- a/tests/docs/bug-104.xml +++ b/tests/general/bug-104.xml diff --git a/tests/docs/bug-105.xml b/tests/general/bug-105.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-105.xml +++ b/tests/general/bug-105.xml diff --git a/tests/docs/bug-106.xml b/tests/general/bug-106.xml index 98e62997..98e62997 100644 --- a/tests/docs/bug-106.xml +++ b/tests/general/bug-106.xml diff --git a/tests/docs/bug-107.xml b/tests/general/bug-107.xml index 2ecf374c..2ecf374c 100644 --- a/tests/docs/bug-107.xml +++ b/tests/general/bug-107.xml diff --git a/tests/docs/bug-108.xml b/tests/general/bug-108.xml index 9ec6ac20..9ec6ac20 100644 --- a/tests/docs/bug-108.xml +++ b/tests/general/bug-108.xml diff --git a/tests/docs/bug-109.xml b/tests/general/bug-109.xml index 920dd995..920dd995 100644 --- a/tests/docs/bug-109.xml +++ b/tests/general/bug-109.xml diff --git a/tests/docs/bug-11-.xml b/tests/general/bug-11-.xml index 64fe27f1..64fe27f1 100644 --- a/tests/docs/bug-11-.xml +++ b/tests/general/bug-11-.xml diff --git a/tests/docs/bug-110.ent b/tests/general/bug-110.ent index eaa70cf9..eaa70cf9 100644 --- a/tests/docs/bug-110.ent +++ b/tests/general/bug-110.ent diff --git a/tests/general/bug-110.err b/tests/general/bug-110.err deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-110.err +++ /dev/null diff --git a/tests/docs/bug-110.xml b/tests/general/bug-110.xml index 6a201193..6a201193 100644 --- a/tests/docs/bug-110.xml +++ b/tests/general/bug-110.xml diff --git a/tests/docs/bug-111.xml b/tests/general/bug-111.xml index b10f5152..b10f5152 100644 --- a/tests/docs/bug-111.xml +++ b/tests/general/bug-111.xml diff --git a/tests/docs/bug-112.xml b/tests/general/bug-112.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-112.xml +++ b/tests/general/bug-112.xml diff --git a/tests/docs/bug-113.xml b/tests/general/bug-113.xml index e0612240..e0612240 100644 --- a/tests/docs/bug-113.xml +++ b/tests/general/bug-113.xml diff --git a/tests/docs/bug-114.xml b/tests/general/bug-114.xml index 7ee54b4b..7ee54b4b 100644 --- a/tests/docs/bug-114.xml +++ b/tests/general/bug-114.xml diff --git a/tests/docs/bug-115.xml b/tests/general/bug-115.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-115.xml +++ b/tests/general/bug-115.xml diff --git a/tests/docs/bug-116.xml b/tests/general/bug-116.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-116.xml +++ b/tests/general/bug-116.xml diff --git a/tests/docs/bug-117.xml b/tests/general/bug-117.xml index 4369f107..4369f107 100644 --- a/tests/docs/bug-117.xml +++ b/tests/general/bug-117.xml diff --git a/tests/docs/bug-118.xml b/tests/general/bug-118.xml index 7b8a7dd1..7b8a7dd1 100644 --- a/tests/docs/bug-118.xml +++ b/tests/general/bug-118.xml diff --git a/tests/docs/bug-119.xml b/tests/general/bug-119.xml index 72cc3ecf..72cc3ecf 100644 --- a/tests/docs/bug-119.xml +++ b/tests/general/bug-119.xml diff --git a/tests/docs/bug-12-.xml b/tests/general/bug-12-.xml index af18b360..af18b360 100644 --- a/tests/docs/bug-12-.xml +++ b/tests/general/bug-12-.xml diff --git a/tests/docs/bug-120.xml b/tests/general/bug-120.xml index e2c80aeb..e2c80aeb 100644 --- a/tests/docs/bug-120.xml +++ b/tests/general/bug-120.xml diff --git a/tests/docs/bug-121.xml b/tests/general/bug-121.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-121.xml +++ b/tests/general/bug-121.xml diff --git a/tests/docs/bug-122.xml b/tests/general/bug-122.xml index b2c1b4ec..b2c1b4ec 100644 --- a/tests/docs/bug-122.xml +++ b/tests/general/bug-122.xml diff --git a/tests/docs/bug-123.xml b/tests/general/bug-123.xml index effc8a0c..effc8a0c 100644 --- a/tests/docs/bug-123.xml +++ b/tests/general/bug-123.xml diff --git a/tests/docs/bug-124.xml b/tests/general/bug-124.xml index 15ec5b0a..15ec5b0a 100644 --- a/tests/docs/bug-124.xml +++ b/tests/general/bug-124.xml diff --git a/tests/docs/bug-125.xml b/tests/general/bug-125.xml index 90b36d68..90b36d68 100644 --- a/tests/docs/bug-125.xml +++ b/tests/general/bug-125.xml diff --git a/tests/docs/bug-126.xml b/tests/general/bug-126.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-126.xml +++ b/tests/general/bug-126.xml diff --git a/tests/docs/bug-127.xml b/tests/general/bug-127.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-127.xml +++ b/tests/general/bug-127.xml diff --git a/tests/docs/bug-128.xml b/tests/general/bug-128.xml index 0a3027d2..0a3027d2 100644 --- a/tests/docs/bug-128.xml +++ b/tests/general/bug-128.xml diff --git a/tests/docs/bug-129.xml b/tests/general/bug-129.xml index 2ec6d994..2ec6d994 100644 --- a/tests/docs/bug-129.xml +++ b/tests/general/bug-129.xml diff --git a/tests/docs/bug-13-.xml b/tests/general/bug-13-.xml index a01ae291..a01ae291 100644 --- a/tests/docs/bug-13-.xml +++ b/tests/general/bug-13-.xml diff --git a/tests/docs/bug-130.doc b/tests/general/bug-130.doc index ce28433e..ce28433e 100644 --- a/tests/docs/bug-130.doc +++ b/tests/general/bug-130.doc diff --git a/tests/docs/bug-130.xml b/tests/general/bug-130.xml index c375b9ac..c375b9ac 100644 --- a/tests/docs/bug-130.xml +++ b/tests/general/bug-130.xml diff --git a/tests/general/bug-130.xsl b/tests/general/bug-130.xsl index 1ac6e9fc..27377d22 100644 --- a/tests/general/bug-130.xsl +++ b/tests/general/bug-130.xsl @@ -10,7 +10,7 @@ <xsl:output method="html" indent="no"/> -<xsl:variable name="g.doc.root" select="document('../docs/bug-130.doc')"/> +<xsl:variable name="g.doc.root" select="document('bug-130.doc')"/> <xsl:template match="/"> <html> diff --git a/tests/docs/bug-131.xml b/tests/general/bug-131.xml index cc77fb4d..cc77fb4d 100644 --- a/tests/docs/bug-131.xml +++ b/tests/general/bug-131.xml diff --git a/tests/docs/bug-132.xml b/tests/general/bug-132.xml index b4db7917..b4db7917 100644 --- a/tests/docs/bug-132.xml +++ b/tests/general/bug-132.xml diff --git a/tests/docs/bug-133.xml b/tests/general/bug-133.xml index 07164941..07164941 100644 --- a/tests/docs/bug-133.xml +++ b/tests/general/bug-133.xml diff --git a/tests/docs/bug-134.xml b/tests/general/bug-134.xml index 9d5f51f9..9d5f51f9 100644 --- a/tests/docs/bug-134.xml +++ b/tests/general/bug-134.xml diff --git a/tests/docs/bug-135.xml b/tests/general/bug-135.xml index 9d5f51f9..9d5f51f9 100644 --- a/tests/docs/bug-135.xml +++ b/tests/general/bug-135.xml diff --git a/tests/docs/bug-136.xml b/tests/general/bug-136.xml index af34d2b0..af34d2b0 100644 --- a/tests/docs/bug-136.xml +++ b/tests/general/bug-136.xml diff --git a/tests/docs/bug-137.xml b/tests/general/bug-137.xml index 69f40625..69f40625 100644 --- a/tests/docs/bug-137.xml +++ b/tests/general/bug-137.xml diff --git a/tests/docs/bug-138.xml b/tests/general/bug-138.xml index 6ff36cf6..6ff36cf6 100644 --- a/tests/docs/bug-138.xml +++ b/tests/general/bug-138.xml diff --git a/tests/docs/bug-139.xml b/tests/general/bug-139.xml index 9340011c..9340011c 100644 --- a/tests/docs/bug-139.xml +++ b/tests/general/bug-139.xml diff --git a/tests/docs/bug-14-.xml b/tests/general/bug-14-.xml index 1be92ec7..1be92ec7 100644 --- a/tests/docs/bug-14-.xml +++ b/tests/general/bug-14-.xml diff --git a/tests/docs/bug-140.xml b/tests/general/bug-140.xml index 54a1d225..54a1d225 100644 --- a/tests/docs/bug-140.xml +++ b/tests/general/bug-140.xml diff --git a/tests/docs/bug-141.xml b/tests/general/bug-141.xml index 115b7c3f..115b7c3f 100644 --- a/tests/docs/bug-141.xml +++ b/tests/general/bug-141.xml diff --git a/tests/docs/bug-142.xml b/tests/general/bug-142.xml index 295bb03a..295bb03a 100755 --- a/tests/docs/bug-142.xml +++ b/tests/general/bug-142.xml diff --git a/tests/docs/bug-143.xml b/tests/general/bug-143.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-143.xml +++ b/tests/general/bug-143.xml diff --git a/tests/docs/bug-144.xml b/tests/general/bug-144.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-144.xml +++ b/tests/general/bug-144.xml diff --git a/tests/general/bug-145.err b/tests/general/bug-145.err index 5daeab4c..79d6a505 100644 --- a/tests/general/bug-145.err +++ b/tests/general/bug-145.err @@ -2,4 +2,4 @@ compilation error: file ./bug-145.xsl line 4 element transform xsl:version is missing: document may not be a stylesheet runtime error: file ./bug-145.xsl line 6 element call-template The called template '{a}a' was not found. -no result for ./../docs/bug-145.xml +no result for ./bug-145.xml diff --git a/tests/general/bug-145.out b/tests/general/bug-145.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-145.out +++ /dev/null diff --git a/tests/docs/bug-145.xml b/tests/general/bug-145.xml index 14061a1d..14061a1d 100644 --- a/tests/docs/bug-145.xml +++ b/tests/general/bug-145.xml diff --git a/tests/docs/bug-146.xml b/tests/general/bug-146.xml index f879acdf..f879acdf 100644 --- a/tests/docs/bug-146.xml +++ b/tests/general/bug-146.xml diff --git a/tests/docs/bug-147.xml b/tests/general/bug-147.xml index d3a17685..d3a17685 100644 --- a/tests/docs/bug-147.xml +++ b/tests/general/bug-147.xml diff --git a/tests/docs/bug-148.xml b/tests/general/bug-148.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-148.xml +++ b/tests/general/bug-148.xml diff --git a/tests/docs/bug-149.xml b/tests/general/bug-149.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-149.xml +++ b/tests/general/bug-149.xml diff --git a/tests/docs/bug-15-.xml b/tests/general/bug-15-.xml index 1ab284b0..1ab284b0 100644 --- a/tests/docs/bug-15-.xml +++ b/tests/general/bug-15-.xml diff --git a/tests/docs/bug-150.xml b/tests/general/bug-150.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-150.xml +++ b/tests/general/bug-150.xml diff --git a/tests/general/bug-151.out b/tests/general/bug-151.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-151.out +++ /dev/null diff --git a/tests/docs/bug-151.xml b/tests/general/bug-151.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-151.xml +++ b/tests/general/bug-151.xml diff --git a/tests/docs/bug-152.xml b/tests/general/bug-152.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-152.xml +++ b/tests/general/bug-152.xml diff --git a/tests/docs/bug-153.doc b/tests/general/bug-153.doc index ea2a7a06..ea2a7a06 100644 --- a/tests/docs/bug-153.doc +++ b/tests/general/bug-153.doc diff --git a/tests/docs/bug-153.xml b/tests/general/bug-153.xml index 35e58523..35e58523 100644 --- a/tests/docs/bug-153.xml +++ b/tests/general/bug-153.xml diff --git a/tests/general/bug-153.xsl b/tests/general/bug-153.xsl index 68b05324..3de7f7c3 100644 --- a/tests/general/bug-153.xsl +++ b/tests/general/bug-153.xsl @@ -10,7 +10,7 @@ <xsl:template match="c"> <p> - <xsl:value-of select="document('../docs/bug-153.doc')/ch/v[@name=current()/v]"/> + <xsl:value-of select="document('bug-153.doc')/ch/v[@name=current()/v]"/> </p> </xsl:template> diff --git a/tests/general/bug-154.out b/tests/general/bug-154.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-154.out +++ /dev/null diff --git a/tests/docs/bug-154.xml b/tests/general/bug-154.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-154.xml +++ b/tests/general/bug-154.xml diff --git a/tests/docs/bug-155.xml b/tests/general/bug-155.xml index a583694e..a583694e 100644 --- a/tests/docs/bug-155.xml +++ b/tests/general/bug-155.xml diff --git a/tests/general/bug-156.out b/tests/general/bug-156.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-156.out +++ /dev/null diff --git a/tests/docs/bug-156.xml b/tests/general/bug-156.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-156.xml +++ b/tests/general/bug-156.xml diff --git a/tests/docs/bug-157.xml b/tests/general/bug-157.xml index 14cac783..14cac783 100644 --- a/tests/docs/bug-157.xml +++ b/tests/general/bug-157.xml diff --git a/tests/docs/bug-158.doc b/tests/general/bug-158.doc index 80b3f018..80b3f018 100644 --- a/tests/docs/bug-158.doc +++ b/tests/general/bug-158.doc diff --git a/tests/docs/bug-158.xml b/tests/general/bug-158.xml index 19837413..19837413 100644 --- a/tests/docs/bug-158.xml +++ b/tests/general/bug-158.xml diff --git a/tests/general/bug-158.xsl b/tests/general/bug-158.xsl index 3b955dca..230aca23 100644 --- a/tests/general/bug-158.xsl +++ b/tests/general/bug-158.xsl @@ -7,7 +7,7 @@ xmlns="http://www.w3.org/1999/xhtml"> <xsl:variable name="myPath" select="/dsl:page/@path" /> -<xsl:variable name="layout" select="document('../docs/bug-158.doc')"/> +<xsl:variable name="layout" select="document('bug-158.doc')"/> <xsl:variable name="root"><xsl:value-of select="$layout//layout:page[@path=$myPath]" /> </xsl:variable> diff --git a/tests/docs/bug-159.xml b/tests/general/bug-159.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-159.xml +++ b/tests/general/bug-159.xml diff --git a/tests/docs/bug-16-.xml b/tests/general/bug-16-.xml index 92e4247f..92e4247f 100644 --- a/tests/docs/bug-16-.xml +++ b/tests/general/bug-16-.xml diff --git a/tests/docs/bug-160.xml b/tests/general/bug-160.xml index 3abe6b5a..3abe6b5a 100644 --- a/tests/docs/bug-160.xml +++ b/tests/general/bug-160.xml diff --git a/tests/docs/bug-161.xml b/tests/general/bug-161.xml index b1548f38..b1548f38 100644 --- a/tests/docs/bug-161.xml +++ b/tests/general/bug-161.xml diff --git a/tests/docs/bug-163.xml b/tests/general/bug-163.xml index 5209f085..5209f085 100644 --- a/tests/docs/bug-163.xml +++ b/tests/general/bug-163.xml diff --git a/tests/docs/bug-164.xml b/tests/general/bug-164.xml index 920546dc..920546dc 100644 --- a/tests/docs/bug-164.xml +++ b/tests/general/bug-164.xml diff --git a/tests/general/bug-165.err b/tests/general/bug-165.err index dab9d7ef..df0e7949 100644 --- a/tests/general/bug-165.err +++ b/tests/general/bug-165.err @@ -3,4 +3,4 @@ Variable 'pStyle' has not been declared. XPath error : Undefined variable runtime error: file ./bug-165.xsl line 6 element value-of XPath evaluation returned no result. -no result for ./../docs/bug-165.xml +no result for ./bug-165.xml diff --git a/tests/general/bug-165.out b/tests/general/bug-165.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-165.out +++ /dev/null diff --git a/tests/docs/bug-165.xml b/tests/general/bug-165.xml index 7c2846b2..7c2846b2 100644 --- a/tests/docs/bug-165.xml +++ b/tests/general/bug-165.xml diff --git a/tests/docs/bug-166.xml b/tests/general/bug-166.xml index e4e363c2..e4e363c2 100644 --- a/tests/docs/bug-166.xml +++ b/tests/general/bug-166.xml diff --git a/tests/docs/bug-167.xml b/tests/general/bug-167.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-167.xml +++ b/tests/general/bug-167.xml diff --git a/tests/docs/bug-168.xml b/tests/general/bug-168.xml index cd13d419..cd13d419 100644 --- a/tests/docs/bug-168.xml +++ b/tests/general/bug-168.xml diff --git a/tests/docs/bug-169.xml b/tests/general/bug-169.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-169.xml +++ b/tests/general/bug-169.xml diff --git a/tests/docs/bug-17-.xml b/tests/general/bug-17-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-17-.xml +++ b/tests/general/bug-17-.xml diff --git a/tests/docs/bug-170.xml b/tests/general/bug-170.xml index 08c3c4dc..08c3c4dc 100644 --- a/tests/docs/bug-170.xml +++ b/tests/general/bug-170.xml diff --git a/tests/docs/bug-171.xml b/tests/general/bug-171.xml index 658021be..658021be 100644 --- a/tests/docs/bug-171.xml +++ b/tests/general/bug-171.xml diff --git a/tests/docs/bug-172.xml b/tests/general/bug-172.xml index 406f40d1..406f40d1 100644 --- a/tests/docs/bug-172.xml +++ b/tests/general/bug-172.xml diff --git a/tests/docs/bug-173.xml b/tests/general/bug-173.xml index f3f286ea..f3f286ea 100644 --- a/tests/docs/bug-173.xml +++ b/tests/general/bug-173.xml diff --git a/tests/general/bug-174.out b/tests/general/bug-174.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-174.out +++ /dev/null diff --git a/tests/docs/bug-174.xml b/tests/general/bug-174.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-174.xml +++ b/tests/general/bug-174.xml diff --git a/tests/docs/bug-175.xml b/tests/general/bug-175.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-175.xml +++ b/tests/general/bug-175.xml diff --git a/tests/docs/bug-176.xml b/tests/general/bug-176.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-176.xml +++ b/tests/general/bug-176.xml diff --git a/tests/docs/bug-177.xml b/tests/general/bug-177.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-177.xml +++ b/tests/general/bug-177.xml diff --git a/tests/docs/bug-178.xml b/tests/general/bug-178.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-178.xml +++ b/tests/general/bug-178.xml diff --git a/tests/docs/bug-179.xml b/tests/general/bug-179.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-179.xml +++ b/tests/general/bug-179.xml diff --git a/tests/docs/bug-18-.xml b/tests/general/bug-18-.xml index f706ec40..f706ec40 100644 --- a/tests/docs/bug-18-.xml +++ b/tests/general/bug-18-.xml diff --git a/tests/general/bug-180.err b/tests/general/bug-180.err index 7b15044d..76e3ae1d 100644 --- a/tests/general/bug-180.err +++ b/tests/general/bug-180.err @@ -1,4 +1,4 @@ runtime error: file ./bug-180.xsl line 4 element copy-of Variable 'xxx' has not been declared. XPath error : Undefined variable -no result for ./../docs/bug-180.xml +no result for ./bug-180.xml diff --git a/tests/general/bug-180.out b/tests/general/bug-180.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-180.out +++ /dev/null diff --git a/tests/docs/bug-180.xml b/tests/general/bug-180.xml index 2ca0eba5..2ca0eba5 100644 --- a/tests/docs/bug-180.xml +++ b/tests/general/bug-180.xml diff --git a/tests/docs/bug-181.xml b/tests/general/bug-181.xml index 285b69a1..285b69a1 100644 --- a/tests/docs/bug-181.xml +++ b/tests/general/bug-181.xml diff --git a/tests/docs/bug-182.xml b/tests/general/bug-182.xml index 02b378db..02b378db 100644 --- a/tests/docs/bug-182.xml +++ b/tests/general/bug-182.xml diff --git a/tests/docs/bug-183.xml b/tests/general/bug-183.xml index bcd45a88..bcd45a88 100644 --- a/tests/docs/bug-183.xml +++ b/tests/general/bug-183.xml diff --git a/tests/general/bug-184.err b/tests/general/bug-184.err index eaeb65bd..ddcef71d 100644 --- a/tests/general/bug-184.err +++ b/tests/general/bug-184.err @@ -3,4 +3,4 @@ Variable 'nonexistent' has not been declared. XPath error : Undefined variable runtime error: file ./bug-184.xsl line 5 element value-of XPath evaluation returned no result. -no result for ./../docs/bug-184.xml +no result for ./bug-184.xml diff --git a/tests/general/bug-184.out b/tests/general/bug-184.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-184.out +++ /dev/null diff --git a/tests/docs/bug-184.xml b/tests/general/bug-184.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-184.xml +++ b/tests/general/bug-184.xml diff --git a/tests/docs/bug-186.xml b/tests/general/bug-186.xml index 424db6bd..424db6bd 100644 --- a/tests/docs/bug-186.xml +++ b/tests/general/bug-186.xml diff --git a/tests/docs/bug-187.xml b/tests/general/bug-187.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-187.xml +++ b/tests/general/bug-187.xml diff --git a/tests/docs/bug-188.xml b/tests/general/bug-188.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-188.xml +++ b/tests/general/bug-188.xml diff --git a/tests/docs/bug-189.xml b/tests/general/bug-189.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-189.xml +++ b/tests/general/bug-189.xml diff --git a/tests/docs/bug-19-.xml b/tests/general/bug-19-.xml index f706ec40..f706ec40 100644 --- a/tests/docs/bug-19-.xml +++ b/tests/general/bug-19-.xml diff --git a/tests/docs/bug-190.xml b/tests/general/bug-190.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-190.xml +++ b/tests/general/bug-190.xml diff --git a/tests/general/bug-191.out b/tests/general/bug-191.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-191.out +++ /dev/null diff --git a/tests/docs/bug-191.xml b/tests/general/bug-191.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-191.xml +++ b/tests/general/bug-191.xml diff --git a/tests/docs/bug-192.xml b/tests/general/bug-192.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-192.xml +++ b/tests/general/bug-192.xml diff --git a/tests/docs/bug-193.xml b/tests/general/bug-193.xml index 91dccb3f..91dccb3f 100644 --- a/tests/docs/bug-193.xml +++ b/tests/general/bug-193.xml diff --git a/tests/general/bug-194.err b/tests/general/bug-194.err index 2d5a6bef..79b9b009 100644 --- a/tests/general/bug-194.err +++ b/tests/general/bug-194.err @@ -6,4 +6,4 @@ Failed to evaluate the expression of variable 'p'. XPath error : Undefined variable runtime error: file ./bug-194.xsl line 5 element param Failed to evaluate the expression of variable 'p2'. -no result for ./../docs/bug-194.xml +no result for ./bug-194.xml diff --git a/tests/general/bug-194.out b/tests/general/bug-194.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-194.out +++ /dev/null diff --git a/tests/docs/bug-194.xml b/tests/general/bug-194.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-194.xml +++ b/tests/general/bug-194.xml diff --git a/tests/docs/bug-195.xml b/tests/general/bug-195.xml index 4b5f3b0a..4b5f3b0a 100644 --- a/tests/docs/bug-195.xml +++ b/tests/general/bug-195.xml diff --git a/tests/docs/bug-196.xml b/tests/general/bug-196.xml index d82bb846..d82bb846 100644 --- a/tests/docs/bug-196.xml +++ b/tests/general/bug-196.xml diff --git a/tests/docs/bug-197.xml b/tests/general/bug-197.xml index ae793921..ae793921 100644 --- a/tests/docs/bug-197.xml +++ b/tests/general/bug-197.xml diff --git a/tests/docs/bug-198.xml b/tests/general/bug-198.xml index ad6e2cae..ad6e2cae 100644 --- a/tests/docs/bug-198.xml +++ b/tests/general/bug-198.xml diff --git a/tests/docs/bug-199.xml b/tests/general/bug-199.xml index 47a355a0..47a355a0 100644 --- a/tests/docs/bug-199.xml +++ b/tests/general/bug-199.xml diff --git a/tests/docs/bug-2-.xml b/tests/general/bug-2-.xml index 94879b01..94879b01 100644 --- a/tests/docs/bug-2-.xml +++ b/tests/general/bug-2-.xml diff --git a/tests/docs/bug-20-.xml b/tests/general/bug-20-.xml index f1302fd7..f1302fd7 100644 --- a/tests/docs/bug-20-.xml +++ b/tests/general/bug-20-.xml diff --git a/tests/docs/bug-200.xml b/tests/general/bug-200.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-200.xml +++ b/tests/general/bug-200.xml diff --git a/tests/general/bug-201.err b/tests/general/bug-201.err index a115d4d2..624c4c55 100644 --- a/tests/general/bug-201.err +++ b/tests/general/bug-201.err @@ -3,4 +3,4 @@ exsltFuncFunctionFunction: Potentially infinite recursion detected in function { XPath error : Stack usage error runtime error: file ./bug-201.xsl line 8 element param Failed to evaluate the expression of variable 'var'. -no result for ./../docs/bug-201.xml +no result for ./bug-201.xml diff --git a/tests/general/bug-201.out b/tests/general/bug-201.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-201.out +++ /dev/null diff --git a/tests/docs/bug-201.xml b/tests/general/bug-201.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-201.xml +++ b/tests/general/bug-201.xml diff --git a/tests/general/bug-202.out b/tests/general/bug-202.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-202.out +++ /dev/null diff --git a/tests/docs/bug-202.xml b/tests/general/bug-202.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-202.xml +++ b/tests/general/bug-202.xml diff --git a/tests/general/bug-203.out b/tests/general/bug-203.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-203.out +++ /dev/null diff --git a/tests/docs/bug-203.xml b/tests/general/bug-203.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-203.xml +++ b/tests/general/bug-203.xml diff --git a/tests/general/bug-204.out b/tests/general/bug-204.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-204.out +++ /dev/null diff --git a/tests/docs/bug-204.xml b/tests/general/bug-204.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-204.xml +++ b/tests/general/bug-204.xml diff --git a/tests/docs/bug-205.xml b/tests/general/bug-205.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-205.xml +++ b/tests/general/bug-205.xml diff --git a/tests/docs/bug-206.xml b/tests/general/bug-206.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-206.xml +++ b/tests/general/bug-206.xml diff --git a/tests/docs/bug-207.xml b/tests/general/bug-207.xml index 3cf443a9..3cf443a9 100644 --- a/tests/docs/bug-207.xml +++ b/tests/general/bug-207.xml diff --git a/tests/general/bug-208.err b/tests/general/bug-208.err index 02c97121..4b96fa74 100644 --- a/tests/general/bug-208.err +++ b/tests/general/bug-208.err @@ -3,4 +3,4 @@ XPath error : Undefined namespace prefix XPath error : Undefined namespace prefix XPath error : Undefined namespace prefix XPath error : Undefined namespace prefix -no result for ./../docs/bug-208.xml +no result for ./bug-208.xml diff --git a/tests/general/bug-208.out b/tests/general/bug-208.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-208.out +++ /dev/null diff --git a/tests/docs/bug-208.xml b/tests/general/bug-208.xml index 5d3529ae..5d3529ae 100644 --- a/tests/docs/bug-208.xml +++ b/tests/general/bug-208.xml diff --git a/tests/docs/bug-209.xml b/tests/general/bug-209.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-209.xml +++ b/tests/general/bug-209.xml diff --git a/tests/general/bug-21-.out b/tests/general/bug-21-.out index 8a98dfde..ac45087a 100644 --- a/tests/general/bug-21-.out +++ b/tests/general/bug-21-.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> -../docs/test.jpg +test.jpg diff --git a/tests/docs/bug-21-.xml b/tests/general/bug-21-.xml index 05a269eb..05a269eb 100644 --- a/tests/docs/bug-21-.xml +++ b/tests/general/bug-21-.xml diff --git a/tests/docs/bug-210.xml b/tests/general/bug-210.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-210.xml +++ b/tests/general/bug-210.xml diff --git a/tests/docs/bug-211.xml b/tests/general/bug-211.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-211.xml +++ b/tests/general/bug-211.xml diff --git a/tests/docs/bug-212.xml b/tests/general/bug-212.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-212.xml +++ b/tests/general/bug-212.xml diff --git a/tests/docs/bug-213.xml b/tests/general/bug-213.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-213.xml +++ b/tests/general/bug-213.xml diff --git a/tests/docs/bug-214.xml b/tests/general/bug-214.xml index 196b8025..196b8025 100644 --- a/tests/docs/bug-214.xml +++ b/tests/general/bug-214.xml diff --git a/tests/general/bug-215.err b/tests/general/bug-215.err index 3d8dc184..4d4fd80f 100644 --- a/tests/general/bug-215.err +++ b/tests/general/bug-215.err @@ -2,4 +2,4 @@ XPath error : Stack usage error runtime error: file ./bug-215.xsl line 5 element variable Evaluating global variable var/param being computed failed -no result for ./../docs/bug-215.xml +no result for ./bug-215.xml diff --git a/tests/general/bug-215.out b/tests/general/bug-215.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/general/bug-215.out +++ /dev/null diff --git a/tests/docs/bug-215.xml b/tests/general/bug-215.xml index ead3414d..ead3414d 100644 --- a/tests/docs/bug-215.xml +++ b/tests/general/bug-215.xml diff --git a/tests/docs/bug-216.xml b/tests/general/bug-216.xml index d128aecc..d128aecc 100644 --- a/tests/docs/bug-216.xml +++ b/tests/general/bug-216.xml diff --git a/tests/docs/bug-217.xml b/tests/general/bug-217.xml index f1999f80..f1999f80 100644 --- a/tests/docs/bug-217.xml +++ b/tests/general/bug-217.xml diff --git a/tests/docs/bug-218.xml b/tests/general/bug-218.xml index 38065478..38065478 100644 --- a/tests/docs/bug-218.xml +++ b/tests/general/bug-218.xml diff --git a/tests/docs/bug-219.xml b/tests/general/bug-219.xml index 65497811..65497811 100644 --- a/tests/docs/bug-219.xml +++ b/tests/general/bug-219.xml diff --git a/tests/docs/bug-22-.xml b/tests/general/bug-22-.xml index 63e79899..63e79899 100644 --- a/tests/docs/bug-22-.xml +++ b/tests/general/bug-22-.xml diff --git a/tests/docs/bug-220.xml b/tests/general/bug-220.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-220.xml +++ b/tests/general/bug-220.xml diff --git a/tests/docs/bug-221.xml b/tests/general/bug-221.xml index d9d4bacf..d9d4bacf 100644 --- a/tests/docs/bug-221.xml +++ b/tests/general/bug-221.xml diff --git a/tests/docs/bug-222.xml b/tests/general/bug-222.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-222.xml +++ b/tests/general/bug-222.xml diff --git a/tests/docs/bug-23-.xml b/tests/general/bug-23-.xml index 4ff059f1..4ff059f1 100644 --- a/tests/docs/bug-23-.xml +++ b/tests/general/bug-23-.xml diff --git a/tests/docs/bug-24-.xml b/tests/general/bug-24-.xml index e11821ed..e11821ed 100644 --- a/tests/docs/bug-24-.xml +++ b/tests/general/bug-24-.xml diff --git a/tests/docs/bug-25-.xml b/tests/general/bug-25-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-25-.xml +++ b/tests/general/bug-25-.xml diff --git a/tests/docs/bug-26-.xml b/tests/general/bug-26-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-26-.xml +++ b/tests/general/bug-26-.xml diff --git a/tests/docs/bug-27-.xml b/tests/general/bug-27-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-27-.xml +++ b/tests/general/bug-27-.xml diff --git a/tests/docs/bug-28-.xml b/tests/general/bug-28-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-28-.xml +++ b/tests/general/bug-28-.xml diff --git a/tests/docs/bug-29-.ent b/tests/general/bug-29-.ent index 6ba97269..6ba97269 100644 --- a/tests/docs/bug-29-.ent +++ b/tests/general/bug-29-.ent diff --git a/tests/docs/bug-29-.xml b/tests/general/bug-29-.xml index 80bde4b9..80bde4b9 100644 --- a/tests/docs/bug-29-.xml +++ b/tests/general/bug-29-.xml diff --git a/tests/docs/bug-3-.xml b/tests/general/bug-3-.xml index 400a2d5f..400a2d5f 100644 --- a/tests/docs/bug-3-.xml +++ b/tests/general/bug-3-.xml diff --git a/tests/docs/bug-30-.xml b/tests/general/bug-30-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-30-.xml +++ b/tests/general/bug-30-.xml diff --git a/tests/docs/bug-31-.xml b/tests/general/bug-31-.xml index 873400f9..873400f9 100644 --- a/tests/docs/bug-31-.xml +++ b/tests/general/bug-31-.xml diff --git a/tests/docs/bug-32-.xml b/tests/general/bug-32-.xml index 91d2bb6a..91d2bb6a 100644 --- a/tests/docs/bug-32-.xml +++ b/tests/general/bug-32-.xml diff --git a/tests/docs/bug-33-.xml b/tests/general/bug-33-.xml index c58f4d57..c58f4d57 100644 --- a/tests/docs/bug-33-.xml +++ b/tests/general/bug-33-.xml diff --git a/tests/docs/bug-35-.xml b/tests/general/bug-35-.xml index b7f9231b..b7f9231b 100644 --- a/tests/docs/bug-35-.xml +++ b/tests/general/bug-35-.xml diff --git a/tests/docs/bug-36-.xml b/tests/general/bug-36-.xml index 4d6bd03f..4d6bd03f 100644 --- a/tests/docs/bug-36-.xml +++ b/tests/general/bug-36-.xml diff --git a/tests/docs/bug-37-.xml b/tests/general/bug-37-.xml index 4d6bd03f..4d6bd03f 100644 --- a/tests/docs/bug-37-.xml +++ b/tests/general/bug-37-.xml diff --git a/tests/docs/bug-38-.xml b/tests/general/bug-38-.xml index 57d0e820..57d0e820 100644 --- a/tests/docs/bug-38-.xml +++ b/tests/general/bug-38-.xml diff --git a/tests/docs/bug-39-.xml b/tests/general/bug-39-.xml index ae743ebf..ae743ebf 100644 --- a/tests/docs/bug-39-.xml +++ b/tests/general/bug-39-.xml diff --git a/tests/docs/bug-4-.xml b/tests/general/bug-4-.xml index db0534d6..db0534d6 100644 --- a/tests/docs/bug-4-.xml +++ b/tests/general/bug-4-.xml diff --git a/tests/docs/bug-40-.xml b/tests/general/bug-40-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-40-.xml +++ b/tests/general/bug-40-.xml diff --git a/tests/docs/bug-41-.xml b/tests/general/bug-41-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-41-.xml +++ b/tests/general/bug-41-.xml diff --git a/tests/docs/bug-42-.xml b/tests/general/bug-42-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-42-.xml +++ b/tests/general/bug-42-.xml diff --git a/tests/docs/bug-43-.xml b/tests/general/bug-43-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-43-.xml +++ b/tests/general/bug-43-.xml diff --git a/tests/docs/bug-44-.xml b/tests/general/bug-44-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-44-.xml +++ b/tests/general/bug-44-.xml diff --git a/tests/docs/bug-45-.xml b/tests/general/bug-45-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-45-.xml +++ b/tests/general/bug-45-.xml diff --git a/tests/docs/bug-46-.xml b/tests/general/bug-46-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-46-.xml +++ b/tests/general/bug-46-.xml diff --git a/tests/docs/bug-47-.xml b/tests/general/bug-47-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-47-.xml +++ b/tests/general/bug-47-.xml diff --git a/tests/docs/bug-48-.xml b/tests/general/bug-48-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-48-.xml +++ b/tests/general/bug-48-.xml diff --git a/tests/docs/bug-49-.xml b/tests/general/bug-49-.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-49-.xml +++ b/tests/general/bug-49-.xml diff --git a/tests/docs/bug-5-.xml b/tests/general/bug-5-.xml index f5a34ecd..f5a34ecd 100644 --- a/tests/docs/bug-5-.xml +++ b/tests/general/bug-5-.xml diff --git a/tests/docs/bug-50-.xml b/tests/general/bug-50-.xml index 0d0cc5b9..0d0cc5b9 100644 --- a/tests/docs/bug-50-.xml +++ b/tests/general/bug-50-.xml diff --git a/tests/general/bug-52.out b/tests/general/bug-52.out index 486ba022..3179a6a7 100644 --- a/tests/general/bug-52.out +++ b/tests/general/bug-52.out @@ -1,3 +1,3 @@ -Graphic file=../docs/graphic.gif +Graphic file=graphic.gif diff --git a/tests/docs/bug-52.xml b/tests/general/bug-52.xml index 66a10a50..66a10a50 100644 --- a/tests/docs/bug-52.xml +++ b/tests/general/bug-52.xml diff --git a/tests/docs/bug-53.xml b/tests/general/bug-53.xml index 27ed7a8d..27ed7a8d 100644 --- a/tests/docs/bug-53.xml +++ b/tests/general/bug-53.xml diff --git a/tests/docs/bug-54.xml b/tests/general/bug-54.xml index 188b15af..188b15af 100644 --- a/tests/docs/bug-54.xml +++ b/tests/general/bug-54.xml diff --git a/tests/docs/bug-55.xml b/tests/general/bug-55.xml index 98f1f7a3..98f1f7a3 100644 --- a/tests/docs/bug-55.xml +++ b/tests/general/bug-55.xml diff --git a/tests/docs/bug-56.xml b/tests/general/bug-56.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-56.xml +++ b/tests/general/bug-56.xml diff --git a/tests/docs/bug-57.xml b/tests/general/bug-57.xml index c65312dc..c65312dc 100644 --- a/tests/docs/bug-57.xml +++ b/tests/general/bug-57.xml diff --git a/tests/docs/bug-59.xml b/tests/general/bug-59.xml index 64ce75b4..64ce75b4 100644 --- a/tests/docs/bug-59.xml +++ b/tests/general/bug-59.xml diff --git a/tests/docs/bug-6-.xml b/tests/general/bug-6-.xml index e0222812..e0222812 100644 --- a/tests/docs/bug-6-.xml +++ b/tests/general/bug-6-.xml diff --git a/tests/docs/bug-60.xml b/tests/general/bug-60.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-60.xml +++ b/tests/general/bug-60.xml diff --git a/tests/docs/bug-61.xml b/tests/general/bug-61.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-61.xml +++ b/tests/general/bug-61.xml diff --git a/tests/docs/bug-62.xml b/tests/general/bug-62.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-62.xml +++ b/tests/general/bug-62.xml diff --git a/tests/docs/bug-63.xml b/tests/general/bug-63.xml index dd4d8357..dd4d8357 100644 --- a/tests/docs/bug-63.xml +++ b/tests/general/bug-63.xml diff --git a/tests/docs/bug-64.xml b/tests/general/bug-64.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-64.xml +++ b/tests/general/bug-64.xml diff --git a/tests/docs/bug-65.xml b/tests/general/bug-65.xml index e2a137c5..e2a137c5 100644 --- a/tests/docs/bug-65.xml +++ b/tests/general/bug-65.xml diff --git a/tests/docs/bug-66.xml b/tests/general/bug-66.xml index 70babc47..70babc47 100644 --- a/tests/docs/bug-66.xml +++ b/tests/general/bug-66.xml diff --git a/tests/docs/bug-68.xml b/tests/general/bug-68.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-68.xml +++ b/tests/general/bug-68.xml diff --git a/tests/docs/bug-69.xml b/tests/general/bug-69.xml index d2c746b6..d2c746b6 100644 --- a/tests/docs/bug-69.xml +++ b/tests/general/bug-69.xml diff --git a/tests/docs/bug-7-.xml b/tests/general/bug-7-.xml index 171d61b9..171d61b9 100644 --- a/tests/docs/bug-7-.xml +++ b/tests/general/bug-7-.xml diff --git a/tests/docs/bug-70.xml b/tests/general/bug-70.xml index b5080dd3..b5080dd3 100644 --- a/tests/docs/bug-70.xml +++ b/tests/general/bug-70.xml diff --git a/tests/docs/bug-71.xml b/tests/general/bug-71.xml index 555662cc..555662cc 100644 --- a/tests/docs/bug-71.xml +++ b/tests/general/bug-71.xml diff --git a/tests/docs/bug-72.xml b/tests/general/bug-72.xml index 90060bd2..90060bd2 100644 --- a/tests/docs/bug-72.xml +++ b/tests/general/bug-72.xml diff --git a/tests/docs/bug-73.xml b/tests/general/bug-73.xml index 0b2cb1c3..0b2cb1c3 100644 --- a/tests/docs/bug-73.xml +++ b/tests/general/bug-73.xml diff --git a/tests/docs/bug-74.xml b/tests/general/bug-74.xml index f030d508..f030d508 100644 --- a/tests/docs/bug-74.xml +++ b/tests/general/bug-74.xml diff --git a/tests/docs/bug-75.xml b/tests/general/bug-75.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-75.xml +++ b/tests/general/bug-75.xml diff --git a/tests/docs/bug-76.xml b/tests/general/bug-76.xml index 6f5ae8ea..6f5ae8ea 100644 --- a/tests/docs/bug-76.xml +++ b/tests/general/bug-76.xml diff --git a/tests/docs/bug-77.xml b/tests/general/bug-77.xml index e414475e..e414475e 100644 --- a/tests/docs/bug-77.xml +++ b/tests/general/bug-77.xml diff --git a/tests/docs/bug-78.xml b/tests/general/bug-78.xml index c5987944..c5987944 100644 --- a/tests/docs/bug-78.xml +++ b/tests/general/bug-78.xml diff --git a/tests/docs/bug-79.xml b/tests/general/bug-79.xml index a94a515a..a94a515a 100644 --- a/tests/docs/bug-79.xml +++ b/tests/general/bug-79.xml diff --git a/tests/docs/bug-8-.xml b/tests/general/bug-8-.xml index 975f42d6..975f42d6 100644 --- a/tests/docs/bug-8-.xml +++ b/tests/general/bug-8-.xml diff --git a/tests/docs/bug-80.xml b/tests/general/bug-80.xml index 4acc5823..4acc5823 100644 --- a/tests/docs/bug-80.xml +++ b/tests/general/bug-80.xml diff --git a/tests/docs/bug-81.xml b/tests/general/bug-81.xml index 45220c94..45220c94 100644 --- a/tests/docs/bug-81.xml +++ b/tests/general/bug-81.xml diff --git a/tests/docs/bug-82.xml b/tests/general/bug-82.xml index f58bb8ef..f58bb8ef 100644 --- a/tests/docs/bug-82.xml +++ b/tests/general/bug-82.xml diff --git a/tests/docs/bug-83.xml b/tests/general/bug-83.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-83.xml +++ b/tests/general/bug-83.xml diff --git a/tests/docs/bug-84.xml b/tests/general/bug-84.xml index 948c9ddd..948c9ddd 100644 --- a/tests/docs/bug-84.xml +++ b/tests/general/bug-84.xml diff --git a/tests/docs/bug-86.xml b/tests/general/bug-86.xml index 12eabe1a..12eabe1a 100644 --- a/tests/docs/bug-86.xml +++ b/tests/general/bug-86.xml diff --git a/tests/docs/bug-87.xml b/tests/general/bug-87.xml index 7761b4b4..7761b4b4 100644 --- a/tests/docs/bug-87.xml +++ b/tests/general/bug-87.xml diff --git a/tests/docs/bug-88.xml b/tests/general/bug-88.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-88.xml +++ b/tests/general/bug-88.xml diff --git a/tests/docs/bug-89.xml b/tests/general/bug-89.xml index 2528660f..2528660f 100644 --- a/tests/docs/bug-89.xml +++ b/tests/general/bug-89.xml diff --git a/tests/docs/bug-9-.xml b/tests/general/bug-9-.xml index f3810665..f3810665 100644 --- a/tests/docs/bug-9-.xml +++ b/tests/general/bug-9-.xml diff --git a/tests/docs/bug-90.xml b/tests/general/bug-90.xml index 99894746..99894746 100644 --- a/tests/docs/bug-90.xml +++ b/tests/general/bug-90.xml diff --git a/tests/docs/bug-91.xml b/tests/general/bug-91.xml index 64a348aa..64a348aa 100644 --- a/tests/docs/bug-91.xml +++ b/tests/general/bug-91.xml diff --git a/tests/docs/bug-92.xml b/tests/general/bug-92.xml index 501b187a..501b187a 100644 --- a/tests/docs/bug-92.xml +++ b/tests/general/bug-92.xml diff --git a/tests/docs/bug-93.xml b/tests/general/bug-93.xml index f1999f80..f1999f80 100644 --- a/tests/docs/bug-93.xml +++ b/tests/general/bug-93.xml diff --git a/tests/docs/bug-94.xml b/tests/general/bug-94.xml index 10935f77..10935f77 100644 --- a/tests/docs/bug-94.xml +++ b/tests/general/bug-94.xml diff --git a/tests/docs/bug-95.xml b/tests/general/bug-95.xml index 91f84d4a..91f84d4a 100644 --- a/tests/docs/bug-95.xml +++ b/tests/general/bug-95.xml diff --git a/tests/docs/bug-96.xml b/tests/general/bug-96.xml index 1f8d9d45..1f8d9d45 100644 --- a/tests/docs/bug-96.xml +++ b/tests/general/bug-96.xml diff --git a/tests/docs/bug-97.xml b/tests/general/bug-97.xml index bba9c3be..bba9c3be 100644 --- a/tests/docs/bug-97.xml +++ b/tests/general/bug-97.xml diff --git a/tests/docs/bug-98.xml b/tests/general/bug-98.xml index d4c827a4..d4c827a4 100644 --- a/tests/docs/bug-98.xml +++ b/tests/general/bug-98.xml diff --git a/tests/docs/bug-99.xml b/tests/general/bug-99.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/bug-99.xml +++ b/tests/general/bug-99.xml diff --git a/tests/docs/character.xml b/tests/general/character.xml index 815e9678..815e9678 100644 --- a/tests/docs/character.xml +++ b/tests/general/character.xml diff --git a/tests/docs/date_add.xml b/tests/general/date_add.xml index 69d62f2c..69d62f2c 100644 --- a/tests/docs/date_add.xml +++ b/tests/general/date_add.xml diff --git a/tests/REC1/doc.dtd b/tests/general/doc.dtd index f06b4dc4..f06b4dc4 100644 --- a/tests/REC1/doc.dtd +++ b/tests/general/doc.dtd diff --git a/tests/REC1/result.xml b/tests/general/doc.out index 4e7836b3..4e7836b3 100644 --- a/tests/REC1/result.xml +++ b/tests/general/doc.out diff --git a/tests/REC1/doc.xml b/tests/general/doc.xml index 0bad2544..0bad2544 100644 --- a/tests/REC1/doc.xml +++ b/tests/general/doc.xml diff --git a/tests/REC1/doc.xsl b/tests/general/doc.xsl index bcc60a4d..bcc60a4d 100644 --- a/tests/REC1/doc.xsl +++ b/tests/general/doc.xsl diff --git a/tests/docs/items.xml b/tests/general/items.xml index 78a94c85..78a94c85 100644 --- a/tests/docs/items.xml +++ b/tests/general/items.xml diff --git a/tests/keys/Makefile.am b/tests/keys/Makefile.am deleted file mode 100644 index faeed361..00000000 --- a/tests/keys/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = dates.xml month.xml month.xsl month.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running keys tests' - @(echo > .memdump) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/month.xsl $(srcdir)/dates.xml > month.res ; \ - if [ -r $(srcdir)/month.out ] ; \ - then diff $(srcdir)/month.out month.res ; \ - else mv month.res $(srcdir)/month.out ; fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f month.res) - diff --git a/tests/keys/month.out b/tests/keys/dates.out index 088c1c7b..088c1c7b 100644 --- a/tests/keys/month.out +++ b/tests/keys/dates.out diff --git a/tests/keys/month.xsl b/tests/keys/dates.xsl index 336c0364..336c0364 100644 --- a/tests/keys/month.xsl +++ b/tests/keys/dates.xsl diff --git a/tests/multiple/Makefile.am b/tests/multiple/Makefile.am index 1c40c2d5..d02a4bef 100644 --- a/tests/multiple/Makefile.am +++ b/tests/multiple/Makefile.am @@ -30,11 +30,7 @@ GENERATED = \ CLEANFILES = .memdump -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc +check-local: $(top_builddir)/xsltproc/xsltproc @echo '## Running multiple tests' @(echo > .memdump) @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/dict.xsl $(srcdir)/dict.xml > dict.res ; \ diff --git a/tests/namespaces/Makefile.am b/tests/namespaces/Makefile.am deleted file mode 100644 index a81f22f4..00000000 --- a/tests/namespaces/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - extra.xml extra.xsl extra.out \ - extra2.xml extra2.xsl extra2.out extra2.err\ - tst.xml tst.xsl tst.out \ - tst2.xml tst2.xsl tst2.out \ - tst3.xml tst3.xsl tst3.out \ - tst4.xml tst4.xsl tst4.out \ - tst5.xml tst5.xsl tst5.out \ - tst6.xml tst6.xsl tst6.out \ - tst7.xml tst7.xsl tst7.out \ - tst8.xml tst8.xsl tst8.out \ - tst9.xml tst9.xsl tst9.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running namespaces tests' - @(echo > .memdump) - -@(for i in $(srcdir)/*.xml ; do \ - if [ -d $$i ] ; then continue ; fi ; \ - doc=`basename $$i .xml` ; \ - j=$(srcdir)/$$doc.xsl ; \ - if [ ! -f $$j ] ; then continue ; fi ; \ - if [ -d $$j ] ; then continue ; fi ; \ - name=`basename $$j .xsl`; \ - out=$(srcdir)/"$$name".out; \ - err=$(srcdir)/"$$name".err; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \ - > result.$$name 2>err.$$name; \ - if [ ! -f $$out ] ; then \ - cp result.$$name $$out ; \ - if [ -s err.$$name ] ; then \ - cp err.$$name $$err ; \ - fi ; \ - else \ - diff $$out result.$$name; \ - if [ -s $$err ] ; then \ - diff $$err err.$$name; \ - else \ - diff /dev/null err.$$name; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f result.$$name err.$$name; \ - done) - diff --git a/tests/namespaces/extra2.out b/tests/namespaces/extra2.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/namespaces/extra2.out +++ /dev/null diff --git a/tests/numbers/Makefile.am b/tests/numbers/Makefile.am deleted file mode 100644 index 8fa9ba0a..00000000 --- a/tests/numbers/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = format-number.xsl format-number.xml format-number.out - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running numbers tests' - @(echo > .memdump) - @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/format-number.xsl $(srcdir)/format-number.xml > format-number.res ; \ - diff $(srcdir)/format-number.out format-number.res ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f format-number.res) - diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am deleted file mode 100644 index 98b2c977..00000000 --- a/tests/plugins/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = plugin.out plugin.xml plugin.xsl - -AM_CPPFLAGS = -I$(top_srcdir) -I../../libxslt - -CLEANFILES = *.res - -if WITH_MODULES - -noinst_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la - -# our rpath is a rather unorthodox location as we -# don't want to pollute $(DESTDIR) with the test plugin - -plugindir = $(abs_builddir)/.libs - -xmlsoft_org_xslt_testplugin_la_CFLAGS = $(AM_CFLAGS) -DMODULE_COMPILE -xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c -xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) -xmlsoft_org_xslt_testplugin_la_LDFLAGS = \ - $(AM_LDFLAGS) -no-undefined \ - -module -avoid-version -rpath $(plugindir) - -test-logall: - @echo '## Running plugin tests' - -test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(noinst_LTLIBRARIES) - @LD_LIBRARY_PATH=$(plugindir):$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \ - LIBXSLT_PLUGINS_PATH=$(plugindir) \ - $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res - @diff plugin.out plugin.res - @rm plugin.res - -else - -test tests: - -endif - diff --git a/tests/reports/Makefile.am b/tests/reports/Makefile.am deleted file mode 100644 index aa79b4ad..00000000 --- a/tests/reports/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## Process this file with automake to produce Makefile.in - -$(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; $(MAKE) xsltproc) - -EXTRA_DIST = \ - cmdlineparams.xml cmdlineparams.xsl cmdlineparams.out \ - tst-1.xml tst-1.xsl tst-1.out tst-1.err \ - tst-2.xml tst-2.xsl tst-2.out tst-2.err \ - undefvar.xml undefvar.xsl undefvar.out undefvar.err \ - recglobparam.xsl recglobvar.xsl reclocparam.xsl reclocvar.xsl \ - recglobparam.xml recglobvar.xml reclocparam.xml reclocvar.xml - -CLEANFILES = .memdump - -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc - @echo '## Running reports tests' - @(echo > .memdump) - -@(for i in $(srcdir)/*.xml ; do \ - if [ -d $$i ] ; then continue ; fi ; \ - doc=`basename $$i .xml` ; \ - for j in $(srcdir)/$$doc*.xsl ; do \ - if [ ! -f $$j ] ; then continue ; fi ; \ - if [ -d $$j ] ; then continue ; fi ; \ - name=`basename $$j .xsl`; \ - out=$(srcdir)/"$$name".out; \ - err=$(srcdir)/"$$name".err; \ - log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ - --stringparam test passed_value \ - --stringparam test2 passed_value2 \ - $$j $$i > result.$$name \ - 2> err.$$name ; \ - if [ ! -f $$out ] ; then \ - cp result.$$name $$out ; \ - if [ -s err.$$name ] ; then \ - cp err.$$name $$err ; \ - fi ; \ - else \ - diff $$out result.$$name; \ - if [ -s $$err ] ; then \ - diff $$err err.$$name; \ - else \ - diff /dev/null err.$$name; \ - fi ; \ - fi ; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ - if [ -n "$$log" ] ; then \ - echo $$name result ; \ - echo "$$log" ; \ - fi ; \ - rm -f result.$$name err.$$name; \ - done ; done) - diff --git a/tests/reports/recglobparam.out b/tests/reports/recglobparam.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/recglobparam.out +++ /dev/null diff --git a/tests/reports/recglobvar.out b/tests/reports/recglobvar.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/recglobvar.out +++ /dev/null diff --git a/tests/reports/reclocparam.out b/tests/reports/reclocparam.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/reclocparam.out +++ /dev/null diff --git a/tests/reports/reclocvar.out b/tests/reports/reclocvar.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/reclocvar.out +++ /dev/null diff --git a/tests/reports/tst-1.out b/tests/reports/tst-1.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/tst-1.out +++ /dev/null diff --git a/tests/reports/tst-2.out b/tests/reports/tst-2.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/tst-2.out +++ /dev/null diff --git a/tests/reports/undefvar.out b/tests/reports/undefvar.out deleted file mode 100644 index e69de29b..00000000 --- a/tests/reports/undefvar.out +++ /dev/null diff --git a/tests/runtest.c b/tests/runtest.c new file mode 100644 index 00000000..197acaf5 --- /dev/null +++ b/tests/runtest.c @@ -0,0 +1,866 @@ +/* + * runtest.c: libxslt test suite + * + * See Copyright for the status of this software. + */ + +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <sys/stat.h> + +#ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + #include <io.h> +#else + #include <unistd.h> + #include <glob.h> +#endif + +#include <libxml/parser.h> +#include <libxslt/extensions.h> +#include <libxslt/transform.h> +#include <libxslt/xsltInternals.h> +#include <libxslt/xsltutils.h> +#include <libexslt/exslt.h> + +/* + * O_BINARY is just for Windows compatibility - if it isn't defined + * on this system, avoid any compilation error + */ +#ifdef O_BINARY +#define RD_FLAGS O_RDONLY | O_BINARY +#define WR_FLAGS O_WRONLY | O_CREAT | O_TRUNC | O_BINARY +#else +#define RD_FLAGS O_RDONLY +#define WR_FLAGS O_WRONLY | O_CREAT | O_TRUNC +#endif + +typedef int (*functest) (const char *filename, int options); + +typedef struct testDesc testDesc; +typedef testDesc *testDescPtr; +struct testDesc { + const char *desc; /* description of the test */ + functest func; /* function implementing the test */ + const char *dir; /* directory to change to */ + const char *in; /* glob to path for input files */ + int options; /* parser options for the test */ +}; + +static int update_results = 0; +static char* temp_directory = NULL; +static int checkTestFile(const char *filename); + +#if defined(_WIN32) + +typedef struct +{ + size_t gl_pathc; /* Count of paths matched so far */ + char **gl_pathv; /* List of matched pathnames. */ + size_t gl_offs; /* Slots to reserve in 'gl_pathv'. */ +} glob_t; + +#define GLOB_DOOFFS 0 +static int glob(const char *pattern, ATTRIBUTE_UNUSED int flags, + ATTRIBUTE_UNUSED int errfunc(const char *epath, int eerrno), + glob_t *pglob) { + glob_t *ret; + WIN32_FIND_DATA FindFileData; + HANDLE hFind; + unsigned int nb_paths = 0; + char directory[500]; + int len; + + if ((pattern == NULL) || (pglob == NULL)) return(-1); + + strncpy(directory, pattern, 499); + for (len = strlen(directory);len >= 0;len--) { + if (directory[len] == '/') { + len++; + directory[len] = 0; + break; + } + } + if (len <= 0) + len = 0; + + + ret = pglob; + memset(ret, 0, sizeof(glob_t)); + + hFind = FindFirstFileA(pattern, &FindFileData); + if (hFind == INVALID_HANDLE_VALUE) + return(0); + nb_paths = 20; + ret->gl_pathv = (char **) malloc(nb_paths * sizeof(char *)); + if (ret->gl_pathv == NULL) { + FindClose(hFind); + return(-1); + } + strncpy(directory + len, FindFileData.cFileName, 499 - len); + ret->gl_pathv[ret->gl_pathc] = strdup(directory); + if (ret->gl_pathv[ret->gl_pathc] == NULL) + goto done; + ret->gl_pathc++; + while(FindNextFileA(hFind, &FindFileData)) { + if (FindFileData.cFileName[0] == '.') + continue; + if (ret->gl_pathc + 2 > nb_paths) { + char **tmp = realloc(ret->gl_pathv, nb_paths * 2 * sizeof(char *)); + if (tmp == NULL) + break; + ret->gl_pathv = tmp; + nb_paths *= 2; + } + strncpy(directory + len, FindFileData.cFileName, 499 - len); + ret->gl_pathv[ret->gl_pathc] = strdup(directory); + if (ret->gl_pathv[ret->gl_pathc] == NULL) + break; + ret->gl_pathc++; + } + ret->gl_pathv[ret->gl_pathc] = NULL; + +done: + FindClose(hFind); + return(0); +} + + + +static void globfree(glob_t *pglob) { + unsigned int i; + if (pglob == NULL) + return; + + for (i = 0;i < pglob->gl_pathc;i++) { + if (pglob->gl_pathv[i] != NULL) + free(pglob->gl_pathv[i]); + } +} + +#endif + +/************************************************************************ + * * + * Libxml2 specific routines * + * * + ************************************************************************/ + +static int nb_tests = 0; +static int nb_errors = 0; +static int nb_leaks = 0; + +static int +fatalError(void) { + fprintf(stderr, "Exiting tests on fatal error\n"); + exit(1); +} + +/* + * Trapping the error messages at the generic level to grab the equivalent of + * stderr messages on CLI tools. + */ +static char testErrors[32769]; +static int testErrorsSize = 0; + +static void XMLCDECL +testErrorHandler(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { + va_list args; + int res; + + if (testErrorsSize >= 32768) + return; + va_start(args, msg); + res = vsnprintf(&testErrors[testErrorsSize], + 32768 - testErrorsSize, + msg, args); + va_end(args); + if (testErrorsSize + res >= 32768) { + /* buffer is full */ + testErrorsSize = 32768; + testErrors[testErrorsSize] = 0; + } else { + testErrorsSize += res; + } + testErrors[testErrorsSize] = 0; +} + +static void XMLCDECL +channel(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { + va_list args; + int res; + + if (testErrorsSize >= 32768) + return; + va_start(args, msg); + res = vsnprintf(&testErrors[testErrorsSize], + 32768 - testErrorsSize, + msg, args); + va_end(args); + if (testErrorsSize + res >= 32768) { + /* buffer is full */ + testErrorsSize = 32768; + testErrors[testErrorsSize] = 0; + } else { + testErrorsSize += res; + } + testErrors[testErrorsSize] = 0; +} + +/** + * xmlParserPrintFileContext: + * @input: an xmlParserInputPtr input + * + * Displays current context within the input content for error tracking + */ + +static void +xmlParserPrintFileContextInternal(xmlParserInputPtr input , + xmlGenericErrorFunc chanl, void *data ) { + const xmlChar *cur, *base; + unsigned int n, col; /* GCC warns if signed, because compared with sizeof() */ + xmlChar content[81]; /* space for 80 chars + line terminator */ + xmlChar *ctnt; + + if (input == NULL) return; + cur = input->cur; + base = input->base; + /* skip backwards over any end-of-lines */ + while ((cur > base) && ((*(cur) == '\n') || (*(cur) == '\r'))) { + cur--; + } + n = 0; + /* search backwards for beginning-of-line (to max buff size) */ + while ((n++ < (sizeof(content)-1)) && (cur > base) && + (*(cur) != '\n') && (*(cur) != '\r')) + cur--; + if ((*(cur) == '\n') || (*(cur) == '\r')) cur++; + /* calculate the error position in terms of the current position */ + col = input->cur - cur; + /* search forward for end-of-line (to max buff size) */ + n = 0; + ctnt = content; + /* copy selected text to our buffer */ + while ((*cur != 0) && (*(cur) != '\n') && + (*(cur) != '\r') && (n < sizeof(content)-1)) { + *ctnt++ = *cur++; + n++; + } + *ctnt = 0; + /* print out the selected text */ + chanl(data ,"%s\n", content); + /* create blank line with problem pointer */ + n = 0; + ctnt = content; + /* (leave buffer space for pointer + line terminator) */ + while ((n<col) && (n++ < sizeof(content)-2) && (*ctnt != 0)) { + if (*(ctnt) != '\t') + *(ctnt) = ' '; + ctnt++; + } + *ctnt++ = '^'; + *ctnt = 0; + chanl(data ,"%s\n", content); +} + +static void +testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED, xmlErrorPtr err) { + char *file = NULL; + int line = 0; + int code = -1; + int domain; + void *data = NULL; + const char *str; + const xmlChar *name = NULL; + xmlNodePtr node; + xmlErrorLevel level; + xmlParserInputPtr input = NULL; + xmlParserInputPtr cur = NULL; + xmlParserCtxtPtr ctxt = NULL; + + if (err == NULL) + return; + + file = err->file; + line = err->line; + code = err->code; + domain = err->domain; + level = err->level; + node = err->node; + if ((domain == XML_FROM_PARSER) || (domain == XML_FROM_HTML) || + (domain == XML_FROM_DTD) || (domain == XML_FROM_NAMESPACE) || + (domain == XML_FROM_IO) || (domain == XML_FROM_VALID)) { + ctxt = err->ctxt; + } + str = err->message; + + if (code == XML_ERR_OK) + return; + + if ((node != NULL) && (node->type == XML_ELEMENT_NODE)) + name = node->name; + + /* + * Maintain the compatibility with the legacy error handling + */ + if (ctxt != NULL) { + input = ctxt->input; + if ((input != NULL) && (input->filename == NULL) && + (ctxt->inputNr > 1)) { + cur = input; + input = ctxt->inputTab[ctxt->inputNr - 2]; + } + if (input != NULL) { + if (input->filename) + channel(data, "%s:%d: ", input->filename, input->line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + channel(data, "Entity: line %d: ", input->line); + } + } else { + if (file != NULL) + channel(data, "%s:%d: ", file, line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + channel(data, "Entity: line %d: ", line); + } + if (name != NULL) { + channel(data, "element %s: ", name); + } + if (code == XML_ERR_OK) + return; + switch (domain) { + case XML_FROM_PARSER: + channel(data, "parser "); + break; + case XML_FROM_NAMESPACE: + channel(data, "namespace "); + break; + case XML_FROM_DTD: + case XML_FROM_VALID: + channel(data, "validity "); + break; + case XML_FROM_HTML: + channel(data, "HTML parser "); + break; + case XML_FROM_MEMORY: + channel(data, "memory "); + break; + case XML_FROM_OUTPUT: + channel(data, "output "); + break; + case XML_FROM_IO: + channel(data, "I/O "); + break; + case XML_FROM_XINCLUDE: + channel(data, "XInclude "); + break; + case XML_FROM_XPATH: + channel(data, "XPath "); + break; + case XML_FROM_XPOINTER: + channel(data, "parser "); + break; + case XML_FROM_REGEXP: + channel(data, "regexp "); + break; + case XML_FROM_MODULE: + channel(data, "module "); + break; + case XML_FROM_SCHEMASV: + channel(data, "Schemas validity "); + break; + case XML_FROM_SCHEMASP: + channel(data, "Schemas parser "); + break; + case XML_FROM_RELAXNGP: + channel(data, "Relax-NG parser "); + break; + case XML_FROM_RELAXNGV: + channel(data, "Relax-NG validity "); + break; + case XML_FROM_CATALOG: + channel(data, "Catalog "); + break; + case XML_FROM_C14N: + channel(data, "C14N "); + break; + case XML_FROM_XSLT: + channel(data, "XSLT "); + break; + default: + break; + } + if (code == XML_ERR_OK) + return; + switch (level) { + case XML_ERR_NONE: + channel(data, ": "); + break; + case XML_ERR_WARNING: + channel(data, "warning : "); + break; + case XML_ERR_ERROR: + channel(data, "error : "); + break; + case XML_ERR_FATAL: + channel(data, "error : "); + break; + } + if (code == XML_ERR_OK) + return; + if (str != NULL) { + int len; + len = xmlStrlen((const xmlChar *)str); + if ((len > 0) && (str[len - 1] != '\n')) + channel(data, "%s\n", str); + else + channel(data, "%s", str); + } else { + channel(data, "%s\n", "out of memory error"); + } + if (code == XML_ERR_OK) + return; + + if (ctxt != NULL) { + xmlParserPrintFileContextInternal(input, channel, data); + if (cur != NULL) { + if (cur->filename) + channel(data, "%s:%d: \n", cur->filename, cur->line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + channel(data, "Entity: line %d: \n", cur->line); + xmlParserPrintFileContextInternal(cur, channel, data); + } + } + if ((domain == XML_FROM_XPATH) && (err->str1 != NULL) && + (err->int1 < 100) && + (err->int1 < xmlStrlen((const xmlChar *)err->str1))) { + xmlChar buf[150]; + int i; + + channel(data, "%s\n", err->str1); + for (i=0;i < err->int1;i++) + buf[i] = ' '; + buf[i++] = '^'; + buf[i] = 0; + channel(data, "%s\n", buf); + } +} + +static void +initializeLibxml2(void) { + xmlInitParser(); + xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader); + xmlSetGenericErrorFunc(NULL, testErrorHandler); + xsltSetGenericErrorFunc(NULL, testErrorHandler); + xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler); + exsltRegisterAll(); + xsltRegisterTestModule(); + xsltMaxDepth = 200; +} + + +/************************************************************************ + * * + * File name and path utilities * + * * + ************************************************************************/ + +static char * +changeSuffix(const char *filename, const char *suffix) { + const char *dot; + char *ret; + char res[500]; + int baseLen; + + dot = strrchr(filename, '.'); + baseLen = dot ? dot - filename : (int) strlen(filename); + snprintf(res, sizeof(res), "%.*s%s", baseLen, filename, suffix); + + ret = strdup(res); + if (ret == NULL) { + fprintf(stderr, "strdup failed\n"); + fatalError(); + } + + return(ret); +} + +static int +checkTestFile(const char *filename) { + struct stat buf; + + if (stat(filename, &buf) == -1) + return(0); + +#if defined(_WIN32) + if (!(buf.st_mode & _S_IFREG)) + return(0); +#else + if (!S_ISREG(buf.st_mode)) + return(0); +#endif + + return(1); +} + +static int compareFileMem(const char *filename, const char *mem, int size) { + int res; + int fd; + char bytes[4096]; + int idx = 0; + struct stat info; + + if (update_results) { + if (size == 0) { + unlink(filename); + return(0); + } + fd = open(filename, WR_FLAGS, 0644); + if (fd < 0) { + fprintf(stderr, "failed to open %s for writing", filename); + return(-1); + } + res = write(fd, mem, size); + close(fd); + return(res != size); + } + + if (stat(filename, &info) < 0) { + if (size == 0) + return(0); + fprintf(stderr, "failed to stat %s\n", filename); + return(-1); + } + if (info.st_size != size) { + fprintf(stderr, "file %s is %ld bytes, result is %d bytes\n", + filename, (long) info.st_size, size); + return(-1); + } + fd = open(filename, RD_FLAGS); + if (fd < 0) { + fprintf(stderr, "failed to open %s for reading", filename); + return(-1); + } + while (idx < size) { + res = read(fd, bytes, 4096); + if (res <= 0) + break; + if (res + idx > size) + break; + if (memcmp(bytes, &mem[idx], res) != 0) { + int ix; + for (ix=0; ix<res; ix++) + if (bytes[ix] != mem[idx+ix]) + break; + fprintf(stderr,"Compare error at position %d\n", idx+ix); + close(fd); + return(1); + } + idx += res; + } + close(fd); + if (idx != size) { + fprintf(stderr,"Compare error index %d, size %d\n", idx, size); + } + return(idx != size); +} + +/************************************************************************ + * * + * Tests implementations * + * * + ************************************************************************/ + +/************************************************************************ + * * + * XSLT tests * + * * + ************************************************************************/ + +static int +xsltTest(const char *filename, int options) { + xsltStylesheetPtr style; + xmlDocPtr styleDoc, doc, outDoc; + xmlChar *out = NULL; + const char *outSuffix, *errSuffix; + char *docFilename, *outFilename, *errFilename; + int outSize = 0; + int res; + int ret = 0; + + styleDoc = xmlReadFile(filename, NULL, XSLT_PARSE_OPTIONS | options); + style = xsltLoadStylesheetPI(styleDoc); + if (style != NULL) { + /* Standalone stylesheet */ + doc = styleDoc; + docFilename = strdup(filename); + + outSuffix = ".stand.out"; + errSuffix = ".stand.err"; + } else { + docFilename = changeSuffix(filename, ".xml"); + if (!checkTestFile(docFilename)) { + goto out; + } + style = xsltParseStylesheetDoc(styleDoc); + if (style == NULL) { + xmlFreeDoc(styleDoc); + } else { + doc = xmlReadFile(docFilename, NULL, XSLT_PARSE_OPTIONS | options); + } + + outSuffix = ".out"; + errSuffix = ".err"; + } + + if (style != NULL) { + const char *params[] = { + "test", "'passed_value'", + "test2", "'passed_value2'", + NULL + }; + + outDoc = xsltApplyStylesheet(style, doc, params); + if (outDoc == NULL) { + /* xsltproc compat */ + channel(NULL, "no result for %s\n", docFilename); + } else { + xsltSaveResultToString(&out, &outSize, outDoc, style); + xmlFreeDoc(outDoc); + } + xsltFreeStylesheet(style); + } + + outFilename = changeSuffix(filename, outSuffix); + res = compareFileMem(outFilename, (char *) out, outSize); + if (res != 0) { + fprintf(stderr, "Result for %s failed\n", filename); + /* printf("####\n%s####\n", out); */ + ret = -1; + } + free(outFilename); + xmlFree(out); + + errFilename = changeSuffix(filename, errSuffix); + res = compareFileMem(errFilename, testErrors, testErrorsSize); + if (res != 0) { + fprintf(stderr, "Error for %s failed\n", filename); + /* printf("####\n%s####\n", testErrors); */ + ret = -1; + } + free(errFilename); + +out: + free(docFilename); + return(ret); +} + +/************************************************************************ + * * + * Tests Descriptions * + * * + ************************************************************************/ + +static +testDesc testDescriptions[] = { + { "REC2 tests", + xsltTest, "REC2", "./*.xsl", 0 }, + { "REC tests", + xsltTest, "REC", "./*.xsl", 0 }, + { "REC tests (standalone)", + xsltTest, "REC", "./stand*.xml", 0 }, + { "REC tests without dictionaries", + xsltTest, "REC", "./*.xsl", XML_PARSE_NODICT }, + { "REC tests without dictionaries (standalone)", + xsltTest, "REC", "./stand*.xml", XML_PARSE_NODICT }, + { "general tests", + xsltTest, "general", "./*.xsl", 0 }, + { "general tests without dictionaries", + xsltTest, "general", "./*.xsl", XML_PARSE_NODICT }, + { "documents tests", + xsltTest, "documents", "./*.xsl", 0 }, + { "numbers tests", + xsltTest, "numbers", "./*.xsl", 0 }, + { "keys tests", + xsltTest, "keys", "./*.xsl", 0 }, + { "namespaces tests", + xsltTest, "namespaces", "./*.xsl", 0 }, + { "extensions tests", + xsltTest, "extensions", "./*.xsl", 0 }, + { "reports tests", + xsltTest, "reports", "./*.xsl", 0 }, + { "exslt common tests", + xsltTest, "exslt/common", "./*.xsl", 0 }, +#if defined(EXSLT_CRYPTO_ENABLED) && !defined(_WIN32) + { "exslt crypto tests", + xsltTest, "exslt/crypto", "./*.xsl", 0 }, +#endif + { "exslt date tests", + xsltTest, "exslt/date", "./*.xsl", 0 }, + { "exslt dynamic tests", + xsltTest, "exslt/dynamic", "./*.xsl", 0 }, + { "exslt functions tests", + xsltTest, "exslt/functions", "./*.xsl", 0 }, + { "exslt math tests", + xsltTest, "exslt/math", "./*.xsl", 0 }, + { "exslt saxon tests", + xsltTest, "exslt/saxon", "./*.xsl", 0 }, + { "exslt sets tests", + xsltTest, "exslt/sets", "./*.xsl", 0 }, + { "exslt strings tests", + xsltTest, "exslt/strings", "./*.xsl", 0 }, +#ifdef LIBXSLT_DEFAULT_PLUGINS_PATH + { "plugin tests", + xsltTest, "plugins", "./*.xsl", 0 }, +#endif + {NULL, NULL, NULL, NULL, 0} +}; + +/************************************************************************ + * * + * The main code driving the tests * + * * + ************************************************************************/ + +static int +launchTests(testDescPtr tst) { + int res = 0, err = 0; + size_t i; + char oldDir[500] = {0}; + + if (tst->dir) { + if (getcwd(oldDir, sizeof(oldDir)) == NULL) { + fprintf(stderr, "Can't can't get current directory\n"); + nb_errors++; + return(1); + } + if (chdir(tst->dir) < 0) { + fprintf(stderr, "Can't change directory to %s\n", tst->dir); + nb_errors++; + return(1); + } + } + + if (tst->in != NULL) { + glob_t globbuf; + + globbuf.gl_offs = 0; + glob(tst->in, GLOB_DOOFFS, NULL, &globbuf); + for (i = 0;i < globbuf.gl_pathc;i++) { + testErrorsSize = 0; + testErrors[0] = 0; + nb_tests++; + res = tst->func(globbuf.gl_pathv[i], tst->options); + xmlResetLastError(); + if (res != 0) { + fprintf(stderr, "File %s generated an error\n", + globbuf.gl_pathv[i]); + nb_errors++; + err++; + } + testErrorsSize = 0; + } + globfree(&globbuf); + } else { + testErrorsSize = 0; + testErrors[0] = 0; + nb_tests++; + res = tst->func(NULL, tst->options); + if (res != 0) { + nb_errors++; + err++; + } + } + + if (oldDir[0] && chdir(oldDir) < 0) { + fprintf(stderr, "Can't change directory to %s\n", oldDir); + nb_errors++; + err++; + } + + return(err); +} + +static int verbose = 0; +static int tests_quiet = 0; + +static int +runtest(int i) { + int ret = 0, res; + int old_errors, old_tests, old_leaks; + + old_errors = nb_errors; + old_tests = nb_tests; + old_leaks = nb_leaks; + if ((tests_quiet == 0) && (testDescriptions[i].desc != NULL)) + printf("## Running %s\n", testDescriptions[i].desc); + res = launchTests(&testDescriptions[i]); + if (res != 0) + ret++; + if (verbose) { + if ((nb_errors == old_errors) && (nb_leaks == old_leaks)) + printf("Ran %d tests, no errors\n", nb_tests - old_tests); + else + printf("Ran %d tests, %d errors, %d leaks\n", + nb_tests - old_tests, + nb_errors - old_errors, + nb_leaks - old_leaks); + } + return(ret); +} + +int +main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { + int i, a, ret = 0; + int subset = 0; + +#if defined(_WIN32) + setvbuf(stdout, NULL, _IONBF, 0); + setvbuf(stderr, NULL, _IONBF, 0); +#endif + +#if defined(_MSC_VER) && _MSC_VER >= 1400 && _MSC_VER < 1900 + _set_output_format(_TWO_DIGIT_EXPONENT); +#endif + + initializeLibxml2(); + + for (a = 1; a < argc;a++) { + if (!strcmp(argv[a], "-v")) + verbose = 1; + else if (!strcmp(argv[a], "-u")) + update_results = 1; + else if (!strcmp(argv[a], "-quiet")) + tests_quiet = 1; + else if (!strcmp(argv[a], "--out")) + temp_directory = argv[++a]; + else { + for (i = 0; testDescriptions[i].func != NULL; i++) { + if (strstr(testDescriptions[i].desc, argv[a])) { + ret += runtest(i); + subset++; + } + } + } + } + if (subset == 0) { + for (i = 0; testDescriptions[i].func != NULL; i++) { + ret += runtest(i); + } + } + if ((nb_errors == 0) && (nb_leaks == 0)) { + ret = 0; + printf("Total %d tests, no errors\n", + nb_tests); + } else { + ret = 1; + printf("Total %d tests, %d errors, %d leaks\n", + nb_tests, nb_errors, nb_leaks); + } + xmlCleanupParser(); + + return(ret); +} diff --git a/tests/plugins/testplugin.c b/tests/testplugin.c index 315d78b2..315d78b2 100644 --- a/tests/plugins/testplugin.c +++ b/tests/testplugin.c diff --git a/tests/xinclude/Makefile.am b/tests/xinclude/Makefile.am index 35624548..81b67241 100644 --- a/tests/xinclude/Makefile.am +++ b/tests/xinclude/Makefile.am @@ -13,11 +13,7 @@ EXTRA_DIST = \ CLEANFILES = .memdump -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc +check-local: $(top_builddir)/xsltproc/xsltproc @echo '## Running XInclude test' @(echo > .memdump) @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/e.xsl $(srcdir)/e.xml > res ; \ diff --git a/tests/xmlspec/Makefile.am b/tests/xmlspec/Makefile.am index 9770058c..8b813293 100644 --- a/tests/xmlspec/Makefile.am +++ b/tests/xmlspec/Makefile.am @@ -9,11 +9,7 @@ EXTRA_DIST = REC-xml-20001006.xml xmlspec-v21.dtd W3C-REC.css \ CLEANFILES = .memdump debug -valgrind: - @echo '## Running the regression tests under Valgrind' - $(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests - -test tests: $(top_builddir)/xsltproc/xsltproc +check-local: $(top_builddir)/xsltproc/xsltproc @echo '## Running xmlspec tests' @(echo > .memdump) @log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc -timing \ diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 3f7c24ee..bf2d5f58 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -2,10 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ -I$(top_builddir) -I$(top_builddir)/libxslt \ -I$(top_builddir)/libexslt -EXTRA_PROGRAMS= bin_PROGRAMS = xsltproc -noinst_PROGRAMS=testThreads +check_PROGRAMS = testThreads xsltproc_SOURCES = xsltproc.c xsltproc_LDFLAGS = @@ -33,7 +32,7 @@ $(top_builddir)/libxslt/libxslt.la: $(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la cd $(top_builddir)/libexslt && $(MAKE) libexslt.la -tests: testThreads +check-local: @echo > .memdump @echo '## Running testThreads' @($(CHECKER) ./testThreads > /dev/null; grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true) |