osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

MSYS2: Fix detection of test suite binaries 

Fix hack to find test binaries. We must only search in run/<config>
if using Visual Studio.
This commit is contained in:
João Valverde 2021-09-24 20:06:00 +01:00 committed by Wireshark GitLab Utility
parent 6c5e56f752
commit ef06593c13
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/fixtures_ws.py
View File

@ -63,7 +63,9 @@ def program_path(request):
'''
curdir_run = os.path.join(os.curdir, 'run')
if sys.platform == 'win32':
curdir_run = os.path.join(curdir_run, 'RelWithDebInfo')
curdir_run_config = os.path.join(curdir_run, 'RelWithDebInfo')
if os.path.exists(curdir_run_config):
curdir_run = curdir_run_config
paths = (
request.config.getoption('--program-path', default=None),
os.environ.get('WS_BIN_PATH'),