Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions test/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
from pathlib import Path
from subprocess import PIPE, STDOUT

from packaging.version import Version

if __name__ == '__main__':
raise Exception('do not run this file directly; do something like: test/runner other')

Expand Down Expand Up @@ -947,10 +945,10 @@ def test_cxx_import(self, args):

@requires_ninja
def test_cmake_cxx_import_std(self):
cmake_minimum = '3.30'
cmake_minimum = (3, 30)
output = self.run_process([EMCMAKE, 'cmake', '--version'], stdout=PIPE).stdout
cmake_version = re.search(r'^cmake version (\d+(?:\.\d+)*)', output).group(1)
if Version(cmake_version) < Version(cmake_minimum):
if tuple(map(int, cmake_version.split('.'))) < cmake_minimum:
self.skipTest(f'CMake > {cmake_minimum} required ({cmake_version})')

self.run_process([EMCMAKE, 'cmake', '-GNinja', test_file('cmake/cxx_import_std')])
Expand Down
Loading