From 9fedb89af38b5a43eb0f7944e938dbbdb17a499d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 29 Nov 2014 18:32:44 -0800 Subject: Factored out cmark.py from test programs. --- test/pathological_tests.py | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'test/pathological_tests.py') diff --git a/test/pathological_tests.py b/test/pathological_tests.py index 999a467..3cf1662 100644 --- a/test/pathological_tests.py +++ b/test/pathological_tests.py @@ -1,12 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from ctypes import CDLL, c_char_p, c_long -from subprocess import * import re import argparse import sys import platform +from cmark import CMark if __name__ == "__main__": parser = argparse.ArgumentParser(description='Run cmark tests.') @@ -16,32 +15,7 @@ if __name__ == "__main__": default=None, help='directory containing dynamic library') args = parser.parse_args(sys.argv[1:]) -if not args.program: - sysname = platform.system() - libname = "libcmark" - if sysname == 'Darwin': - libname += ".dylib" - elif sysname == 'Windows': - libname += ".dll" - else: - libname += ".so" - if args and args.library_dir: - libpath = args.library_dir + "/" + libname - else: - libpath = "build/src/" + libname - cmark = CDLL(libpath) - - markdown = cmark.cmark_markdown_to_html - markdown.restype = c_char_p - markdown.argtypes = [c_char_p, c_long] - -def md2html(text, prog): - if prog: - p1 = Popen(prog.split(), stdout=PIPE, stdin=PIPE, stderr=PIPE) - [result, err] = p1.communicate(input=text) - return [p1.returncode, result, err] - else: - return [0, markdown(text, len(text)), ''] +cmark = CMark(prog=args.program, library_dir=args.library_dir) pathological = { "nested strong emph": @@ -62,7 +36,7 @@ print "Testing pathological cases:" for description in pathological: print description (inp, expected) = pathological[description] - [rc, actual, err] = md2html(inp, args.program) + [rc, actual, err] = cmark.to_html(inp) if rc != 0: errored += 1 print description -- cgit v1.2.3