diff options
author | Gerald Combs <gerald@wireshark.org> | 2007-11-08 16:59:30 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2007-11-08 16:59:30 +0000 |
commit | cd7cc1557ebabf9e9f938875b25134ce74b2b138 (patch) | |
tree | c8a4fe401ce457761490f0f15899ccad885651a6 /test/config.sh | |
parent | 4105173f0e4d0da02e3a0b0a18558fb8628ce0ff (diff) |
Move SKIP_CAPTURE from suite-capture.sh to config.sh so that we can use it
in suite-clopts as well. Allow it to be set externally. This should fix
the "test" failure in the Solairs builder.
svn path=/trunk/; revision=23399
Diffstat (limited to 'test/config.sh')
-rwxr-xr-x | test/config.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/config.sh b/test/config.sh index acc107257b..7f81d784f4 100755 --- a/test/config.sh +++ b/test/config.sh @@ -31,11 +31,17 @@ else WS_SYSTEM=`uname -s` fi -# path to the Wireshark binaries, only used for the settings below + +# Path to the Wireshark binaries, only used for the settings below +WS_BIN_PATH=.. + +# Are we allowed to open interfaces or capture on this system? +SKIP_CAPTURE=${SKIP_CAPTURE:-1} + +# Override the last two items if we're running Windows if [ "$WS_SYSTEM" = "Windows" ] ; then WS_BIN_PATH=../wireshark-gtk2 -else - WS_BIN_PATH=.. + SKIP_CAPTURE=0 fi # Tweak the following to your liking. @@ -64,11 +70,11 @@ TRAFFIC_CAPTURE_DURATION=60 # if you need promiscuous mode, comment this line out TRAFFIC_CAPTURE_PROMISC=-p -# only test capturing from a fifo if we're not on Windows -# and we have a mkfifo. (Windows cygwin has a mkfifo but -# Windows dumpcap & etc use Windows named pipes which -# are different than the cygwin named pipes). -# +# only test capturing from a fifo if we're not on Windows +# and we have a mkfifo. (Windows cygwin has a mkfifo but +# Windows dumpcap & etc use Windows named pipes which +# are different than the cygwin named pipes). +# if [ "$WS_SYSTEM" != "Windows" ] && which mkfifo &>/dev/null ; then TEST_FIFO=1 fi |