diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-12-31 11:04:46 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-12-31 11:04:46 -0800 |
| commit | 4cf38a5569d937142609441a27abf0edb9023da4 (patch) | |
| tree | eb3e9f177bd4f9bbcc15deabc9c764e421c59972 /test | |
| parent | 834266acfdb2aa63e07ae03b08ae11ca21e00dcf (diff) | |
| parent | e8a994cddc17eabaa415c73d970205aa489a756c (diff) | |
Merge pull request #256 from nwellnhof/windows_fixes
Windows fixes
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | test/cmark.py | 2 | ||||
| -rwxr-xr-x | test/spec_tests.py | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f08b325..3d90b38 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,13 +3,6 @@ find_package(PythonInterp 3 REQUIRED) set(PYTHON ${PYTHON_EXECUTABLE}) -if (WIN32) - file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/src WIN_DLL_DIR) - set_tests_properties(api_test PROPERTIES - ENVIRONMENT "PATH=${WIN_DLL_DIR};$ENV{PATH}" - ) -endif(WIN32) - add_test(html_normalization ${PYTHON} "-m" "doctest" "${CMAKE_CURRENT_SOURCE_DIR}/normalize.py" @@ -27,6 +20,13 @@ add_test(pathological_tests_library add_test(NAME api_test COMMAND api_test) +if (WIN32) + file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/src WIN_DLL_DIR) + set_tests_properties(api_test PROPERTIES + ENVIRONMENT "PATH=${WIN_DLL_DIR};$ENV{PATH}" + ) +endif(WIN32) + add_test(spectest_executable ${PYTHON} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_BINARY_DIR}/src/cmark" -)
\ No newline at end of file +) diff --git a/test/cmark.py b/test/cmark.py index 21d0b3f..253e3a8 100644 --- a/test/cmark.py +++ b/test/cmark.py @@ -26,7 +26,7 @@ class CMark: if sysname == 'Darwin': libname += ".dylib" elif sysname == 'Windows': - libname += ".dll" + libname = "cmark.dll" else: libname += ".so" if library_dir: diff --git a/test/spec_tests.py b/test/spec_tests.py index b8b480e..cc676be 100755 --- a/test/spec_tests.py +++ b/test/spec_tests.py @@ -84,7 +84,7 @@ def get_tests(specfile): header_re = re.compile('#+ ') - with open(specfile, 'r') as specf: + with open(specfile, 'r', encoding='utf-8') as specf: for line in specf: line_number = line_number + 1 if state == 0 and re.match(header_re, line): |