Commit graph

34 commits

Author SHA1 Message Date
Chris Maynard
ce6f1d2f9c Whitespace changes: Convert spaces to tabs. Add modelines.
svn path=/trunk/; revision=47975
2013-03-01 16:13:44 +00:00
Jeff Morriss
f0b9d97f18 tshark now accepts -Q.
svn path=/trunk/; revision=46633
2012-12-20 14:36:06 +00:00
Jeff Morriss
349e61ce9e tshark now accepts -g.
svn path=/trunk/; revision=46519
2012-12-12 14:11:53 +00:00
Guy Harris
f3792fdf6b Make the error message for "we didn't get the error message we expected"
clearer - it's not as if we didn't expect to get an error message, we
just didn't expect to get *that particular* error message.

svn path=/trunk/; revision=46118
2012-11-21 19:04:21 +00:00
Guy Harris
7714813e0e For invalid interfaces, just check for "The capture session could not be
initiated", as we used to do.

svn path=/trunk/; revision=46117
2012-11-21 19:01:16 +00:00
Guy Harris
6871a7bb1c We aren't using pcap_create()/pcap_activate() to open interfaces on
Windows, as there isn't yet a WinPcap based on libpcap 1.0.0, so we
don't get PCAP_ERROR_NO_SUCH_DEVICE as a return value and thus don't
just report "No such device exists" for an invalid interface.

svn path=/trunk/; revision=46116
2012-11-21 18:59:27 +00:00
Guy Harris
fd62af338d If we're not on Windows, assume we don't have sufficient privileges to
open any capture devices, so "-i invalid_interface" will fail with a "no
permission" error rather than a "no such device" error.

svn path=/trunk/; revision=46115
2012-11-21 18:56:25 +00:00
Guy Harris
6a205fd224 Give a better failure message for the cases where a test failed not
because of an incorrect exit status but because of the error message not
being what we expected.

Include the name of the program being tested in the capture
filter/interface options tests.

svn path=/trunk/; revision=46110
2012-11-21 17:54:14 +00:00
Guy Harris
17d0007030 Handle an error message that includes single quotes.
svn path=/trunk/; revision=46105
2012-11-21 09:03:30 +00:00
Guy Harris
0e59a15714 Add dumpcap command-line option tests; run them before TShark tests, so
that if dumpcap isn't working right, we don't try TShark tests, as
TShark tests that involve capturing probably won't work.

svn path=/trunk/; revision=46104
2012-11-21 09:01:39 +00:00
Guy Harris
d37123f4d5 Fix the error message to test for when testing "-i invalid_interface".
svn path=/trunk/; revision=46103
2012-11-21 07:06:57 +00:00
Guy Harris
323fabab95 Fix the capitalization of the error message printed if you specify an
invalid interface index.

svn path=/trunk/; revision=46102
2012-11-21 01:11:19 +00:00
Jeff Morriss
f9fc9a2a20 I thought the test suite was run with capture permissions; that does not appear to be true. Fix the expected output for the "invalid interface" test (again).
svn path=/trunk/; revision=46091
2012-11-19 22:11:07 +00:00
Jeff Morriss
e8e7ba68da r46083 added interface name matching which changed the error text when an interface can't be found. Update the test to check for the new wording.
svn path=/trunk/; revision=46086
2012-11-19 20:56:20 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs
005e724d27 Fix the location of dhcp.pcap.
svn path=/trunk/; revision=41857
2012-03-30 18:19:35 +00:00
Michael Tüxen
f98587d686 Undo the checking of command line interfaces. It might the a pipe...
svn path=/trunk/; revision=38146
2011-07-21 17:30:42 +00:00
Michael Tüxen
77022a66b0 Adopt test to new error handling.
svn path=/trunk/; revision=38145
2011-07-21 16:06:52 +00:00
Gerald Combs
710c5d67f7 Update suite-clopts.sh to match dumpcap's error output. Add a comment
to dumpcap.c about keeping the errors synced.

svn path=/trunk/; revision=37805
2011-06-27 16:09:49 +00:00
Guy Harris
0edb77e6f3 TShark now exits with a status of 1 for an invalid interface or capture
filter; check for that, rather than for a status of 0.

svn path=/trunk/; revision=33397
2010-07-01 04:01:13 +00:00
Guy Harris
7ecae442c5 capture() can, in some cases, return FALSE when the capture succeeds;
back out the change to check its return value until we fix that.

Also back out the test suite changes to look for an error exit for
invalid capture filters and interfaces.

svn path=/trunk/; revision=33029
2010-06-01 03:37:51 +00:00
Guy Harris
8d949600af Use return rather than exit in main().
Return 2 for a capture error - we mainly use 1 for command-line syntax
errors (rather than, say, filter syntax errors or an invalid interface).

Now that TShark exits with an error status when given an invalid capture
filter or invalid interface, check for "error" rather than "success" as
an exit status.

svn path=/trunk/; revision=33006
2010-05-28 01:09:28 +00:00
Guy Harris
427ce576a7 -I is now a valid TShark option (at least if you have libpcap 1.x).
svn path=/trunk/; revision=32708
2010-05-07 05:59:32 +00:00
Kovarththanan Rajaratnam
d3c29ea981 -P is no longer invalid. We use it for the 'two pass analysis'
svn path=/trunk/; revision=30083
2009-09-22 21:29:56 +00:00
Bill Meier
0deb0a6555 Add some debug info to help in diagnosing buildbot 'run tests' failures
svn path=/trunk/; revision=24447
2008-02-23 21:19:44 +00:00
Gerald Combs
cd7cc1557e 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
2007-11-08 16:59:30 +00:00
Jörg Mayer
5d913e1701 Propset suite-unittests.sh and add executable to .sh files
svn path=/trunk/; revision=21311
2007-04-03 06:55:25 +00:00
Gerald Combs
e233507308 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
2006-10-09 18:47:42 +00:00
Anders Broman
fbb3dc9bd0 From Richard van der Hoff:
An error message has been changed, such that the commandline options 
test doesn't work any more.

This patch fixes the test accordingly.

svn path=/trunk/; revision=18827
2006-08-02 20:01:20 +00:00
Gerald Combs
8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Ronnie Sahlberg
6075ec39fb ethereal->wireshark
svn path=/trunk/; revision=18207
2006-05-22 08:21:22 +00:00
Ronnie Sahlberg
89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping
8fcb1323e7 interface index 0 is invalid (starting with 1), check if it's rejected correctly
svn path=/trunk/; revision=16946
2006-01-05 00:29:32 +00:00
Ulf Lamping
0922a2b922 add a new directory 'test', currently containing an alpha test (using some simple bash scripts) of the ethereal/tethereal command line parameters. See the file README.test for details.
svn path=/trunk/; revision=16788
2005-12-13 23:15:20 +00:00