diff options
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | test/fixtures_ws.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 82059e4dc6..2db2f0679c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,7 +58,6 @@ before_test: - msbuild /m test-programs.vcxproj test_script: - - set WS_BIN_PATH=%CD%\run\%CONFIGURATION% - pytest -nauto ..\test on_finish: 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): |