Commit Graph

566 Commits

Author SHA1 Message Date
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
Jeff Morriss 30cb074991 zbee.aps was renamed zbee_aps (in r43990).
svn path=/trunk/; revision=44009
2012-07-25 20:09:17 +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 3e85a8f4a2 Add more manufacturer names.
svn path=/trunk/; revision=42973
2012-06-01 15:35:29 +00:00
Gerald Combs 22d347ae3e In recent versions of GLib (test with 2.32) g_log_default_handler
helpfully ignores G_LOG_LEVEL_INFO and G_LOG_LEVEL_DEBUG messages by
default. If the console_log_level preference includes either of those
two levels set the G_MESSAGES_DEBUG environment variable so that those
messages are printed.

Add checks for various console log messages to the stdin capture suite.

Fixes bug 7265.

svn path=/trunk/; revision=42930
2012-05-30 21:42:24 +00:00
Gerald Combs 805c4779fa Update INSTALL_DIR to match r42659.
svn path=/trunk/; revision=42660
2012-05-16 17:57:12 +00:00
Gerald Combs 6e009a575c Print the TShark version information during the prerequisite phase.
svn path=/trunk/; revision=42029
2012-04-12 01:48:44 +00:00
Gerald Combs 794b2ca691 Add a to-do list for more decryption tests.
svn path=/trunk/; revision=41908
2012-04-03 16:10:55 +00:00
Gerald Combs 4326f8de55 Add a test for Zigbee. Compress the 802.11 capture. Fix an error message.
svn path=/trunk/; revision=41898
2012-04-02 18:48:56 +00:00
Gerald Combs 95bd0745b9 Add a test for DTLS decryption.
svn path=/trunk/; revision=41896
2012-04-02 16:37:40 +00:00
Gerald Combs 4b421da47c Add a missing file.
svn path=/trunk/; revision=41866
2012-03-30 23:52:55 +00:00
Gerald Combs 5332cb82b2 Add a WPA PSK decryption test.
svn path=/trunk/; revision=41865
2012-03-30 23:51:48 +00:00
Gerald Combs f21274b7c2 Clobber our personal configuration directory on Windows.
svn path=/trunk/; revision=41860
2012-03-30 21:04:09 +00:00
Gerald Combs 22be69a190 More fixes for Windows. UATs need to be created in ../wireshark-gtk2
and backslashes need to be escaped.

svn path=/trunk/; revision=41859
2012-03-30 20:58:44 +00:00
Jeff Morriss c4678fb771 rsasnakeoil2 is a PCAP file; name it .pcap for consistency. Set SVN properties appropriately.
svn path=/trunk/; revision=41858
2012-03-30 19:57:48 +00:00
Gerald Combs 005e724d27 Fix the location of dhcp.pcap.
svn path=/trunk/; revision=41857
2012-03-30 18:19:35 +00:00
Gerald Combs 3a20e10615 Fix decryption test on Windows.
svn path=/trunk/; revision=41856
2012-03-30 18:13:41 +00:00
Gerald Combs 46e68bab2b Add a missing file.
svn path=/trunk/; revision=41855
2012-03-30 17:59:27 +00:00
Gerald Combs 1bf7a61ac0 Add a decryption test suite along with an SSL decryption test. Move our
growing collection of capture files to a subdirectory.

svn path=/trunk/; revision=41852
2012-03-30 17:51:54 +00:00
Gerald Combs e60c1286b2 Add a "fileformats" suite (copied from the I/O suite) to check file
format conversion. So far we check nanosecond pcap, microsecond pcap-ng
and nanosecond pcap-ng against standard pcap.

Fix color output on OS X.

svn path=/trunk/; revision=41541
2012-03-13 19:58:19 +00:00
Gerald Combs db240c2b5e Replace "-Q" with "WIRESHARK_QUIT_AFTER_CAPTURE" as discussed in bug 6256.
svn path=/trunk/; revision=38784
2011-08-29 21:16:29 +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 53f69df361 Use the proper function name.
svn path=/trunk/; revision=37982
2011-07-11 22:41:53 +00:00
Gerald Combs 30fe3b47ea Re-enable Cygwin's error_start environment variable.
svn path=/trunk/; revision=37860
2011-07-01 21:38:56 +00:00
Gerald Combs 21a1c33639 Comment out the addtion of error_start to CYGWIN in case it's clobbering
Jakub's change in r37857.

svn path=/trunk/; revision=37858
2011-07-01 20:58:10 +00:00
Gerald Combs dd82c59ff9 Fix indentation.
svn path=/trunk/; revision=37855
2011-07-01 19:36:57 +00:00
Gerald Combs 8160523d80 Tell Cygwin to create a core file if we run into any issues.
svn path=/trunk/; revision=37852
2011-07-01 18:32:57 +00:00
Gerald Combs f04a525e79 Temporarily enable dumpcap debugging.
svn path=/trunk/; revision=37844
2011-06-30 17:41:46 +00:00
Gerald Combs 3cb77978f6 Remove tracing.
svn path=/trunk/; revision=37838
2011-06-30 00:24:05 +00:00
Gerald Combs 2d306873c9 Temporarily enable tracing for the stdin capture step.
svn path=/trunk/; revision=37837
2011-06-29 23:10:49 +00:00
Gerald Combs bb75faf9d3 Add more error output to try to see what's causing the current test failure
on the XP buildbot. Use "capture_test_output_print" instead of "cat".

svn path=/trunk/; revision=37825
2011-06-28 23:08:05 +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
Gerald Combs 9c6dc650db Add a check for TShark's return status.
svn path=/trunk/; revision=37774
2011-06-23 19:22:21 +00:00
Gerald Combs d927e094eb Try adding the fifo step to Wireshark. Clean up the order of tests.
svn path=/trunk/; revision=37485
2011-05-31 18:34:24 +00:00
Gerald Combs c1b210c23c Add a "capture from stdin" test.
svn path=/trunk/; revision=37416
2011-05-26 20:23:38 +00:00
Gerald Combs f9fad8cd75 "tshark -D" writes to stderr now.
svn path=/trunk/; revision=37092
2011-05-12 17:49:15 +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 7559d34b7b Clean up indentation.
svn path=/trunk/; revision=33104
2010-06-05 02:19:45 +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
Guy Harris 09a7c78848 "Unit tests" is two words (at least in English).
svn path=/trunk/; revision=32072
2010-03-01 22:53:15 +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
Gerald Combs 507deea5cd Update the adapter name check to match the buildbot.
svn path=/trunk/; revision=29221
2009-07-28 17:27:59 +00:00
Bill Meier f471a317dc test.sh: revise tests to handle revised capinfos output.
svn path=/trunk/; revision=28332
2009-05-11 18:57:08 +00:00
Ulf Lamping e8203bb1b1 add a comment that the ping code is running in the background (that caused me some headache :-)
change the ping packet length, so the last packet will have exactly 100 bytes (at least on Windows)

svn path=/trunk/; revision=24998
2008-04-13 18:50:45 +00:00
Ulf Lamping a2f91ba610 fix a comment
svn path=/trunk/; revision=24980
2008-04-13 15:10:59 +00:00
Ulf Lamping 855d104ac7 update some prerequisites
svn path=/trunk/; revision=24979
2008-04-13 15:09:34 +00:00
Bill Meier f232875378 OK: comment out gathering of debug info; nothing interesting.
svn path=/trunk/; revision=24451
2008-02-24 02:21:37 +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
Guy Harris 503a02879c Is ping not installed on the Solaris buildbot, or does the path of the
script not include /usr/sbin, or is ping installed somewhere other than
where it is on my Solaris "machine"?  Try explicitly running it as
/usr/sbin/ping on Solaris.

svn path=/trunk/; revision=23670
2007-11-29 08:17:44 +00:00
Ulf Lamping 54e08d8e3d fix a comment: manifest files are now embedded into .exe / .dll files, no need to copy them
svn path=/trunk/; revision=23547
2007-11-23 08:42:58 +00:00
Ulf Lamping 9b101b1437 because of the privilege separation done, read filters won't work by definition now. Comment out the corresponding test case
svn path=/trunk/; revision=23546
2007-11-23 08:39:11 +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
Jeff Morriss e32c9da434 As requested on -dev, put the (currently failing) 'Capture 10 packets using stdout' test back in for tshark
svn path=/trunk/; revision=23110
2007-10-09 13:34:08 +00:00
Ulf Lamping 3cc99bbe53 alpha -> beta
svn path=/trunk/; revision=23107
2007-10-09 06:55:24 +00:00
Jeff Morriss 98efc05f19 Temporarily disable 'Capture 10 packets using stdout' test for tshark until we can get that working
svn path=/trunk/; revision=23095
2007-10-08 17:56:10 +00:00
Gerald Combs 9c7e0b2e25 Support Solaris along with Windows.
svn path=/trunk/; revision=23020
2007-09-28 23:40:51 +00:00
Bill Meier 2f31729b20 Re-enable capture tests now that a a dumpcap problem has been corrected.
svn path=/trunk/; revision=22708
2007-08-28 17:49:16 +00:00
Bill Meier c4531ac2a8 Re-enable unittests after determining that they work correctly
on Windows (and shouldn't cause the Windows buildbot any problems).

svn path=/trunk/; revision=22686
2007-08-27 18:09:38 +00:00
Bill Meier cc7d161c4e Prevent execution of the fifo tests on Windows.
(Windows cygwin has a mkfifo but Windows dumpcap & etc
use Windows named pipes which are different than
the cygwin named pipes).

svn path=/trunk/; revision=22685
2007-08-27 17:49:53 +00:00
Bill Meier b089f00013 Disable capture tests and unit tests until possible issues corrected.
Hopefully the windows buildbot will be OK with these tests disabled
temporarily.

svn path=/trunk/; revision=22660
2007-08-25 19:13:00 +00:00
Richard van der Hoff 77181f6db0 do the fifo test on platforms where mkfifo is available
svn path=/trunk/; revision=22640
2007-08-24 15:45:16 +00:00
Bill Meier 4b7eeb8562 Try this again (with a longer timeout and more diagnostic info)
svn path=/trunk/; revision=21811
2007-05-17 02:43:38 +00:00
Bill Meier c5894f5257 Capture tests using Wireshark seem to be causing a problem; disable them for now.
svn path=/trunk/; revision=21791
2007-05-15 16:12:46 +00:00
Bill Meier 6386eda24c Addt'l fixes so suite-unittests will run under windows
svn path=/trunk/; revision=21546
2007-04-24 03:43:08 +00:00
Bill Meier 2c346d9a3c Use correct install target: 'make ..._install (and not 'make 'install_...')
svn path=/trunk/; revision=21545
2007-04-24 02:17:35 +00:00
Richard van der Hoff e12cf1df47 fix typos
svn path=/trunk/; revision=21476
2007-04-19 17:03:58 +00:00
Richard van der Hoff 674306a87d following advice from Gerald, Graham Bloice, and others, let's try copying the unit test executables into the wireshark-gtk2 directory before running them.
svn path=/trunk/; revision=21472
2007-04-18 22:31:47 +00:00
Richard van der Hoff c9360bf853 that didn't help. try skipping the exntest to see if it's just that one.
svn path=/trunk/; revision=21350
2007-04-07 04:35:39 +00:00
Richard van der Hoff 235cfd0f19 make the unit tests spam their output, in an attempt yo understand wtf the matter with the buildbot is
svn path=/trunk/; revision=21349
2007-04-07 02:18:57 +00:00
Richard van der Hoff c7f5b65111 another go at fixing the unit tests under windows - give a -f Makefile.nmake arg
svn path=/trunk/; revision=21314
2007-04-03 13:03:07 +00:00
Richard van der Hoff 2ab63b7719 hopefully fix this for win32 by using nmake
svn path=/trunk/; revision=21312
2007-04-03 10:53:38 +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
Richard van der Hoff 4500ada811 Run the epan unittests as part of the test suite
svn path=/trunk/; revision=21309
2007-04-03 01:54:30 +00:00
Gerald Combs 773cd3dee8 Under Windows, try to use the first interface that looks like Ethernet
as the capture interface.  This should fix the capture test failures on
the Windows builder.

svn path=/trunk/; revision=20989
2007-03-06 23:55:00 +00:00
Bill Meier ec8f13b55d Additoinal diagnostic info in output logs
svn path=/trunk/; revision=20715
2007-02-05 00:57:59 +00:00
Bill Meier bf2696032c Now need to use interface #2 ??
svn path=/trunk/; revision=20590
2007-01-28 20:41:50 +00:00
Bill Meier 23eaea7363 Add some debug output so can see why failure when buildbot runs this script
svn path=/trunk/; revision=20589
2007-01-28 18:56:17 +00:00
Bill Meier ffef6c5b60 Hack so test.sh will work with bash 3.1.6 or greater
which requires 'igncr' to be able to process files in 
'dos format' (\r\n line endings)

svn path=/trunk/; revision=20229
2006-12-28 03:17:28 +00:00
Bill Meier f1721c9d91 OK: I think I've fixed most of the problems in
suite-capture.sh which were causing some 
    of tests to fail;
    The stdout tests still tend to fail: 
    some issue with flushing the stdout pipe ??

svn path=/trunk/; revision=20200
2006-12-22 18:16:22 +00:00
Bill Meier c582bce50d Use interface '1' for the capture tests;
Add additional error output in case any other problems

svn path=/trunk/; revision=20197
2006-12-22 13:00:40 +00:00
Bill Meier 98393c2355 Add additional output to try to find out why the "capture 10
packets" test fails during the run-tests step of the 
buildbot windows build ... 

svn path=/trunk/; revision=20191
2006-12-22 04:46:26 +00:00
Gerald Combs edf99969fd The capture test suite currently fails on quiet networks. Try to fix
this by generating some ICMP packets before each test.  Add an "icmp"
capture filter to each test to better control the test conditions.
Fixup whitespace.

svn path=/trunk/; revision=20115
2006-12-11 18:24:27 +00:00
Gerald Combs aba9c21960 Add command-line options: -c disables color, -h prints help, -s runs
a suite.

svn path=/trunk/; revision=19479
2006-10-10 20:55:38 +00:00
Gerald Combs c43a1dffed Pick up TRAFFIC_CAPTURE_IFACE from the environment if it's set, otherwise
use a default value.

svn path=/trunk/; revision=19466
2006-10-09 23:28:30 +00:00
Gerald Combs 3f96d2a977 Return 1 on failure.
svn path=/trunk/; revision=19464
2006-10-09 20:31:48 +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
Ulf Lamping 2bf897b906 from Richard van der Hoff:
[tshark from a fifo]
I've even gone so far as to add a unit test for it

ULFL: as mkfifo isn't available on Win32 (not even cygwin), make this test configurable in config.sh

svn path=/trunk/; revision=19457
2006-10-08 22:57:32 +00:00
Ulf Lamping e70c6303e1 change the binary path to current windows debug dir: wireshark-gtk2
don't use promiscuous mode as default (my Win32 WLAN card won't capture any packets with it - might probably be better for other users as well)

svn path=/trunk/; revision=19455
2006-10-08 22:24:46 +00:00
Ulf Lamping adc7305cd4 use unique variable names to prevent "global variable" side effects -> endless repeating tests of subsections
svn path=/trunk/; revision=19077
2006-08-29 21:01:05 +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
Ronnie Sahlberg 25c3f0a107 ethereal to wireshark conversion
svn path=/trunk/; revision=18495
2006-06-17 11:49:03 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +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 7d7220fec1 preparation for a very simple regression test
svn path=/trunk/; revision=17342
2006-02-17 22:40:54 +00:00
Ulf Lamping 8a85fa705a add a new suite of file I/O test cases
svn path=/trunk/; revision=16970
2006-01-07 01:15:35 +00:00
Ulf Lamping b82d886798 fix a test case and some comments
svn path=/trunk/; revision=16969
2006-01-07 01:14:29 +00:00
Ulf Lamping 72560c5d1d minor cleanup
svn path=/trunk/; revision=16964
2006-01-06 01:11:31 +00:00
Ulf Lamping eae47c79c1 add a test case: writing the capture file to stdout: "-w -"
svn path=/trunk/; revision=16959
2006-01-05 22:26:05 +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 e897f0a805 add the possibility for a prepare step before doing the actual test step
svn path=/trunk/; revision=16945
2006-01-05 00:28:10 +00:00
Ulf Lamping 270561dd09 add missing keys 4-9
svn path=/trunk/; revision=16944
2006-01-05 00:26:37 +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