Skip to content

Commit

Permalink
Disable extension module tests with Python 3.8 and VS2015.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Oct 20, 2019
1 parent 5eb3875 commit ad1cfbe
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ project('Python extension module', 'c',
py_mod = import('python')
py3 = py_mod.find_installation()
py3_dep = py3.dependency(required : false)
cc = meson.get_compiler('c')

# Copy to the builddir so that blaster.py can find the built tachyon module
# FIXME: We should automatically detect this case and append the correct paths
Expand All @@ -20,6 +21,10 @@ with open(sys.argv[1], 'rb') as f:
assert(f.read() == b'success')
'''
if py3_dep.found()
message('Detected Python version: ' + py3_dep.version())
if py3_dep.version().version_compare('>=3.8') and cc.get_id() == 'msvc' and cc.version().version_compare('<=19.00.24215.1')
error('MESON_SKIP_TEST: Python modules do not work with Python 3.8 and VS2015 or earlier.')
endif
subdir('ext')

out_txt = custom_target('tachyon flux',
Expand Down
9 changes: 9 additions & 0 deletions test cases/python3/2 extmodule/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@ project('Python extension module', 'c',
py3_mod = import('python3')
py3 = py3_mod.find_python()
py3_dep = dependency('python3', required : false)
cc = meson.get_compiler('c')

if py3_dep.found()
message('Detected Python version: ' + py3_dep.version())
# Building extensions for Python 3 using Visual Studio 2015
# no longer works (or, rather, they build but don't run).
# Disable the tests in this case.
if py3_dep.version().version_compare('>=3.8') and cc.get_id() == 'msvc' and cc.version().version_compare('<=19.00.24215.1')
error('MESON_SKIP_TEST: Python modules do not work with Python 3.8 and VS2015 or earlier.')
endif

subdir('ext')

test('extmod',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ project('Python extension module', 'c',
py3_mod = import('python3')
py3 = py3_mod.find_python()
py3_dep = dependency('python3', required : false)
cc = meson.get_compiler('c')

# Copy to the builddir so that blaster.py can find the built tachyon module
# FIXME: We should automatically detect this case and append the correct paths
Expand All @@ -20,6 +21,11 @@ with open(sys.argv[1], 'rb') as f:
assert(f.read() == b'success')
'''
if py3_dep.found()
message('Detected Python version: ' + py3_dep.version())
if py3_dep.version().version_compare('>=3.8') and cc.get_id() == 'msvc' and cc.version().version_compare('<=19.00.24215.1')
error('MESON_SKIP_TEST: Python modules do not work with Python 3.8 and VS2015 or earlier.')
endif

subdir('ext')

out_txt = custom_target('tachyon flux',
Expand Down

0 comments on commit ad1cfbe

Please sign in to comment.