Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert msys2 python shutil workarounds #13949

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Revert msys2 python shutil workarounds #13949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b126d6d
Revert "check if test 33 running under MinGW"
lazka Nov 23, 2024
caa8fd8
Revert "make the testsuite handle MSYS2's addition of cmd"
lazka Nov 23, 2024
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
10 changes: 0 additions & 10 deletions test cases/common/33 run program/check-mingw.py
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions test cases/common/33 run program/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions unittests/windowstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ def test_find_program(self):
PATH to point to a directory with Python scripts.
'''
testdir = os.path.join(self.platform_test_dir, '8 find program')
# Find `xcopy` and `xcopy.exe`
prog1 = ExternalProgram('xcopy')
self.assertTrue(prog1.found(), msg='xcopy not found')
prog2 = ExternalProgram('xcopy.exe')
self.assertTrue(prog2.found(), msg='xcopy.exe not found')
# Find `cmd` and `cmd.exe`
prog1 = ExternalProgram('cmd')
self.assertTrue(prog1.found(), msg='cmd not found')
prog2 = ExternalProgram('cmd.exe')
self.assertTrue(prog2.found(), msg='cmd.exe not found')
self.assertPathEqual(prog1.get_path(), prog2.get_path())
# Find xcopy.exe with args without searching
prog = ExternalProgram('xcopy', command=['xcopy', '/?'])
self.assertTrue(prog.found(), msg='xcopy not found with args')
self.assertPathEqual(prog.get_command()[0], 'xcopy')
# Find xcopy with an absolute path that's missing the extension
xcopy_path = prog2.get_path()[:-4]
prog = ExternalProgram(xcopy_path)
self.assertTrue(prog.found(), msg=f'{xcopy_path!r} not found')
# Find cmd.exe with args without searching
prog = ExternalProgram('cmd', command=['cmd', '/C'])
self.assertTrue(prog.found(), msg='cmd not found with args')
self.assertPathEqual(prog.get_command()[0], 'cmd')
# Find cmd with an absolute path that's missing the extension
cmd_path = prog2.get_path()[:-4]
prog = ExternalProgram(cmd_path)
self.assertTrue(prog.found(), msg=f'{cmd_path!r} not found')
# Finding a script with no extension inside a directory works
prog = ExternalProgram(os.path.join(testdir, 'test-script'))
self.assertTrue(prog.found(), msg='test-script not found')
Expand Down
Loading