Commit Graph

57 Commits

Author SHA1 Message Date
Alexis La Goutte cd558218f7 test suite: fix indent (use tabs) and add modelines
Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0
Reviewed-on: https://code.wireshark.org/review/5985
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:27:48 +00:00
Gerald Combs c55d69780b Try to speed up ping-dependent capture tests.
Ping four times a second for ~60 seconds. Save the subprocess PID so that
we can kill it when we're done with each test instead of waiting for it
to finish.

Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6
Reviewed-on: https://code.wireshark.org/review/4557
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 18:54:13 +00:00
Gerald Combs bdfff4d3c7 Re-enable the Wireshark test suite.
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad
Reviewed-on: https://code.wireshark.org/review/4434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03 00:02:56 +00:00
Gerald Combs ff7b51f920 Partially re-enable Wireshark tests.
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris
buildbots run the test script under Xtightvnc, which provides neither of
those. Only enable the tests on Windows and OS X for now.

Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d
Reviewed-on: https://code.wireshark.org/review/4430
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02 22:49:46 +00:00
Gerald Combs 67f1fa5e56 Temporarily disable the Qt tests added in g58cde5c.
Apparently what works for me doesn't work for the Buildbot users.

Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace
Reviewed-on: https://code.wireshark.org/review/4416
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02 02:20:07 +00:00
Gerald Combs 58cde5c74a Add tests for the Qt UI.
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make
sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce
some time values so that the tests run faster.

Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711
Reviewed-on: https://code.wireshark.org/review/4407
Tested-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01 22:30:33 +00:00
Gerald Combs b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Guy Harris 800b45f0a9 From Peter Wu: on systems other than Windows, skip the GUI tests if the
DISPLAY environment variable isn't set.

From me: note that this won't be the right thing to do on OS X if we
switch to a toolkit that doesn't use X11, and that this may or may not
be the right thing to do with toolkits using Wayland or Mir directly.

svn path=/trunk/; revision=52182
2013-09-22 21:51:05 +00:00
Evan Huus c660aab935 Update the test suite for r51556. Use -Y in one place instead of -R where only
filtering is important. Use -2 and -R together in one place where the counting
functionality is important.

svn path=/trunk/; revision=51558
2013-08-28 02:30:50 +00:00
Gerald Combs 6de14cd99b Disable software updates in a blind attempt to fix the recent test
failures.

svn path=/trunk/; revision=48391
2013-03-18 15:39:12 +00:00
Chris Maynard ce6f1d2f9c Whitespace changes: Convert spaces to tabs. Add modelines.
svn path=/trunk/; revision=47975
2013-03-01 16:13:44 +00:00
Chris Maynard 53893a8a75 Convert spaces to tabs in capture_step_snapshot().
(Maybe this will make the XP buildbot happy so test.sh succeeds again?)

svn path=/trunk/; revision=47969
2013-03-01 06:20:41 +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 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 005e724d27 Fix the location of dhcp.pcap.
svn path=/trunk/; revision=41857
2012-03-30 18:19:35 +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
Gerald Combs 53f69df361 Use the proper function name.
svn path=/trunk/; revision=37982
2011-07-11 22:41:53 +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 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
Guy Harris 7559d34b7b Clean up indentation.
svn path=/trunk/; revision=33104
2010-06-05 02:19:45 +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
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 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
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 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
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
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
Bill Meier ec8f13b55d Additoinal diagnostic info in output logs
svn path=/trunk/; revision=20715
2007-02-05 00:57:59 +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 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 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
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