Wireshark-commits: [Wireshark-commits] master 3f9579e: wsutil: use environment variable WIRESHARK_E
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3f9579e3f5f84262d0f8c849a0f98220fee8d722
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
3f9579e by Peter Wu (peter@xxxxxxxxxxxxx):
wsutil: use environment variable WIRESHARK_EXTCAP_DIR when possible
The WIRESHARK_EXTCAP_DIR environment variable is currently only used on
Windows, and on UN*X when not running from the build directory. In order
to avoid copying the sampleif.py test utility to the program directory,
let's prioritize the environment variable over the build directory.
Update the outdated comments while at it, the version directory has been
removed long time ago. (The comments are based on the one for plugins.)
This also fixes the test suite on macOS where the extcap subdirectory is
located in the appbundle directory and not the build directory.
Change-Id: I329bb233b1dd0b9c1422c2ebd60a6455347e1d62
Reviewed-on: https://code.wireshark.org/review/32890
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 727aaad Qt: Do not turn empty parameter values into spaces
add 3f9579e wsutil: use environment variable WIRESHARK_EXTCAP_DIR when possible
Summary of changes:
test/suite_clopts.py | 18 ++++++-------
wsutil/filesystem.c | 71 +++++++++++++++++++++++-----------------------------
2 files changed, 39 insertions(+), 50 deletions(-)