diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2024-11-23 19:19:12 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-01-07 22:25:26 +0200 |
| commit | f9d70016fc134d03bdfe541455809c71cc867e79 (patch) | |
| tree | 440b8867abda64d0fa4e5c844f03f0b566b38c16 /test cases/common | |
| parent | 29a26ea8175ebc9af66efa40191d9efe906e089b (diff) | |
| download | meson-f9d70016fc134d03bdfe541455809c71cc867e79.zip meson-f9d70016fc134d03bdfe541455809c71cc867e79.tar.gz meson-f9d70016fc134d03bdfe541455809c71cc867e79.tar.bz2 | |
Revert "check if test 33 running under MinGW"
This reverts commit 93f59313e10090bfe6058fabbb235aa549f933c0.
Diffstat (limited to 'test cases/common')
| -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 f10c28b..0000000 --- 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 1cd5305..2257d93 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) |