Rediff patches

Add 0004-test-Fix-regex-syntax-errors.patch: <REASON>
Add 0005-test-Fix-use-of-allowed_failures-in-pathological_tes.patch: <REASON>
Add 0003-Provide-a-way-to-extend-test-timeouts.patch: <REASON>
Add 0002-man-Add-missing-command-line-options.patch: <REASON>
Drop 0002-Provide-a-way-to-extend-test-timeouts.patch: <REASON>
Drop 0003-man-Add-missing-command-line-options.patch: <REASON>
Drop 0004-test-Increase-pathological_tests-timeout-to-50-secon.patch: <REASON>
Drop 0006-test-Fix-use-of-allowed_failures-in-pathological_tes.patch: <REASON>
Drop 0005-test-Fix-regex-syntax-errors.patch: <REASON>

Author: keith-packard

…n-Add-missing-command-line-options.patch …n-Add-missing-command-line-options.patchdebian/patches/0003-man-Add-missing-command-line-options.patch renamed to debian/patches/0002-man-Add-missing-command-line-options.patch debian/patches/0003-man-Add-missing-command-line-options.patch renamed to debian/patches/0002-man-Add-missing-command-line-options.patch

@@ -7,8 +7,9 @@ multiply the timeouts by an arbitrary amount
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- api_test/main.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ api_test/main.c            | 17 +++++++++++++++--
+ test/pathological_tests.py |  4 +++-
+ 2 files changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/api_test/main.c b/api_test/main.c
 index 1a41e69..790327c 100644
@@ -70,3 +71,25 @@ index 1a41e69..790327c 100644
    cmark_enable_safety_checks(true);
    version(runner);
    constructor(runner);
+diff --git a/test/pathological_tests.py b/test/pathological_tests.py
+index d0e910c..f556a1d 100644
+--- a/test/pathological_tests.py
++++ b/test/pathological_tests.py
+@@ -7,6 +7,7 @@ import sys
+ import platform
+ import itertools
+ import multiprocessing
++import os
+ from cmark import CMark
+ 
+ def hash_collisions():
+@@ -106,7 +107,8 @@ whitespace_re = re.compile('/s+/')
+ passed = 0
+ errored = 0
+ ignored = 0
+-TIMEOUT = 5
++timing_scale = float(os.getenv("CMARK_TIMING_SCALE", "1"))
++TIMEOUT = 5 * timing_scale
+ 
+ def run_test(inp, regex):
+     parser = argparse.ArgumentParser(description='Run cmark tests.')

…vide-a-way-to-extend-test-timeouts.patch …vide-a-way-to-extend-test-timeouts.patchdebian/patches/0002-Provide-a-way-to-extend-test-timeouts.patch renamed to debian/patches/0003-Provide-a-way-to-extend-test-timeouts.patch debian/patches/0002-Provide-a-way-to-extend-test-timeouts.patch renamed to debian/patches/0003-Provide-a-way-to-extend-test-timeouts.patch

@@ -35,10 +35,10 @@ index b7fd9b2..ec4979c 100644
          parser = MyHTMLParser()
          # We work around HTMLParser's limitations parsing CDATA
 diff --git a/test/pathological_tests.py b/test/pathological_tests.py
-index 55867ef..9fe1817 100644
+index f556a1d..80b5261 100644
 --- a/test/pathological_tests.py
 +++ b/test/pathological_tests.py
-@@ -29,7 +29,7 @@ def hash_collisions():
+@@ -30,7 +30,7 @@ def hash_collisions():
 
      document = ''.join("[%s]: /url\n\n[%s]\n\n" % (key, bad_key) for key in collisions)
 
@@ -47,7 +47,7 @@ index 55867ef..9fe1817 100644
 
  allowed_failures = {"many references": True}
 
-@@ -47,10 +47,10 @@ pathological = {
+@@ -48,10 +48,10 @@ pathological = {
                    re.compile("(_a ){64999}_a")),
      "many link closers with no openers":
                   (("a]" * 65000),
@@ -60,7 +60,7 @@ index 55867ef..9fe1817 100644
      "mismatched openers and closers":
                   (("*a_ " * 50000),
                    re.compile("([*]a[_] ){49999}[*]a_")),
-@@ -59,19 +59,19 @@ pathological = {
+@@ -60,19 +60,19 @@ pathological = {
                    re.compile("a[*][*]b(c[*] ){49999}c[*]")),
      "link openers and emph closers":
                   (("[ a_" * 50000),
@@ -84,7 +84,7 @@ index 55867ef..9fe1817 100644
      "nested block quotes":
                   ((("> " * 50000) + "a"),
                    re.compile("(<blockquote>\n){50000}")),
-@@ -86,13 +86,13 @@ pathological = {
+@@ -87,13 +87,13 @@ pathological = {
                    re.compile("^<p>[e`]*</p>\n$")),
      "unclosed links A":
                   ("[a](<b" * 30000,

…/0005-test-Fix-regex-syntax-errors.patch …/0004-test-Fix-regex-syntax-errors.patchdebian/patches/0005-test-Fix-regex-syntax-errors.patch renamed to debian/patches/0004-test-Fix-regex-syntax-errors.patch debian/patches/0005-test-Fix-regex-syntax-errors.patch renamed to debian/patches/0004-test-Fix-regex-syntax-errors.patch

@@ -13,10 +13,10 @@ Signed-off-by: Keith Packard <keithp@keithp.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/test/pathological_tests.py b/test/pathological_tests.py
-index 9fe1817..3986471 100644
+index 80b5261..c2fdff6 100644
 --- a/test/pathological_tests.py
 +++ b/test/pathological_tests.py
-@@ -144,12 +144,12 @@ if __name__ == '__main__':
+@@ -146,12 +146,12 @@ if __name__ == '__main__':
              p.terminate()
              p.join()
              print('[TIMED OUT]')

debian/patches/0004-test-Increase-pathological_tests-timeout-to-50-secon.patch

@@ -1,6 +1,5 @@
 0001-Install-all-headers-in-include-cmark-gfm.patch
-0002-Provide-a-way-to-extend-test-timeouts.patch
-0003-man-Add-missing-command-line-options.patch
-0004-test-Increase-pathological_tests-timeout-to-50-secon.patch
-0005-test-Fix-regex-syntax-errors.patch
-0006-test-Fix-use-of-allowed_failures-in-pathological_tes.patch
+0002-man-Add-missing-command-line-options.patch
+0003-Provide-a-way-to-extend-test-timeouts.patch
+0004-test-Fix-regex-syntax-errors.patch
+0005-test-Fix-use-of-allowed_failures-in-pathological_tes.patch