diff options
author | Peter Wu <peter@lekensteyn.nl> | 2019-01-03 20:17:00 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-01-04 18:08:04 +0000 |
commit | 751ba4fadc031fe6e9e021a76351e006d23d16f6 (patch) | |
tree | 7accca390faa020738ac5a96bde6d81d450f9aa5 /test | |
parent | aba0e8eec0363adc6fac1193666b42b2c49e7bab (diff) |
test: assume binaries in $PWD\run\RelWithDebInfo by default
Avoid the need to set `pytest --program-path` in the common case.
Change-Id: I3b237e47eee741decb62a74b733110040aa26673
Reviewed-on: https://code.wireshark.org/review/31348
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/fixtures_ws.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/fixtures_ws.py b/test/fixtures_ws.py index 6fd5d791d1..9999576c30 100644 --- a/test/fixtures_ws.py +++ b/test/fixtures_ws.py @@ -57,10 +57,13 @@ def program_path(request): Path to the Wireshark binaries as set by the --program-path option, the WS_BIN_PATH environment variable or (curdir)/run. ''' + curdir_run = os.path.join(os.curdir, 'run') + if sys.platform == 'win32': + curdir_run = os.path.join(curdir_run, 'RelWithDebInfo') paths = ( request.config.getoption('--program-path', default=None), os.environ.get('WS_BIN_PATH'), - os.path.join(os.curdir, 'run'), + curdir_run, ) for path in paths: if type(path) == str and os.path.isdir(path): |