diff options
author | Gerald Combs <gerald@wireshark.org> | 2006-10-09 18:47:42 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2006-10-09 18:47:42 +0000 |
commit | e2335073089af7372aa333d06ff73ca3cfdd67d7 (patch) | |
tree | d0ecf4d62e754a6cf6aa80fbe80d0011cc23e087 /test/config.sh | |
parent | dfc0a650028470b1084f9f061ff0bdf60b4cbe37 (diff) |
Make preparations for running under Buildbot:
- Check for an "all" argument at startup. If it's present,
then proceed with testing.
- Add a platform check. Use it to handle cases where we can't run
as a normal user, e.g. trying to capture under Linux.
- Add a "Skipped" result.
svn path=/trunk/; revision=19461
Diffstat (limited to 'test/config.sh')
-rw-r--r-- | test/config.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/test/config.sh b/test/config.sh index 3ee935c07b..e3fd1003f5 100644 --- a/test/config.sh +++ b/test/config.sh @@ -21,16 +21,28 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# +# + +# Set WS_SYSTEM to our system type, e.g. Windows, Linux, Darwin +# http://support.microsoft.com/kb/100843 +if [ -n "${OS#Windows}" ] ; then + WS_SYSTEM="Windows" +else + WS_SYSTEM=`uname -s` +fi # path to the Wireshark binaries, only used for the settings below -ETH_BIN_PATH=../wireshark-gtk2 +if [ "$WS_SYSTEM" = "Windows" ] ; then + WS_BIN_PATH=../wireshark-gtk2 +else + WS_BIN_PATH=.. +fi # Tweak the following to your liking. -WIRESHARK=$ETH_BIN_PATH/wireshark -TSHARK=$ETH_BIN_PATH/tshark -CAPINFOS=$ETH_BIN_PATH/capinfos -DUMPCAP=$ETH_BIN_PATH/dumpcap +WIRESHARK=$WS_BIN_PATH/wireshark +TSHARK=$WS_BIN_PATH/tshark +CAPINFOS=$WS_BIN_PATH/capinfos +DUMPCAP=$WS_BIN_PATH/dumpcap # interface with at least a few packets/sec traffic on it # (e.g. start a web radio to generate some traffic :-) |