diff options
| -rwxr-xr-x | test cases/common/33 run program/check-mingw.py | 10 | ||||
| -rw-r--r-- | test cases/common/33 run program/meson.build | 7 |
2 files changed, 2 insertions, 15 deletions
diff --git a/test cases/common/33 run program/check-mingw.py b/test cases/common/33 run program/check-mingw.py deleted file mode 100755 index f10c28ba1..000000000 --- a/test cases/common/33 run program/check-mingw.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 - -import os, sys, re - -if 'MSYSTEM' in os.environ and os.environ['MSYSTEM'] != '': - print(os.environ['MSYSTEM']) -else: - match = re.search(r'[\\/](mingw32|mingw64|clang32|clang64|clangarm64|ucrt64)[\\/]', sys.executable, flags=re.IGNORECASE) - if match: - print(match.group(1).upper()) diff --git a/test cases/common/33 run program/meson.build b/test cases/common/33 run program/meson.build index 1cd530523..2257d93c7 100644 --- a/test cases/common/33 run program/meson.build +++ b/test cases/common/33 run program/meson.build @@ -1,9 +1,6 @@ project('run command', version : run_command('get-version.py', check : true).stdout().strip(), meson_version: '>=0.1.0') -check_mingw = run_command('check-mingw.py', check : true).stdout().strip() -is_mingw = not (check_mingw == '' or check_mingw == 'MSYS') - -if build_machine.system() == 'windows' and not is_mingw +if build_machine.system() == 'windows' c = run_command('cmd', '/c', 'echo', 'hello', check: false) else c = run_command('echo', 'hello', check: false) @@ -48,7 +45,7 @@ endif # We should be able to have files() in argument f = files('meson.build') -if build_machine.system() == 'windows' and not is_mingw +if build_machine.system() == 'windows' c = run_command('cmd', '/c', 'echo', f, check: false) else c = run_command('echo', f, check: false) |