Commit Graph

51 Commits

Author SHA1 Message Date
Balint Reczey b1cc056b12 Remove nghttp2 code and use system' nghttp2
Update debian, macos (setup / homebrew) download script
Update testsuite (don't try HPACK when build without nghttp2)

Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112
Reviewed-on: https://code.wireshark.org/review/17347
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13 19:26:10 +00:00
Vasil Velichckov 8201711e80 text2pcap: Add test suite
Use the pcap captures from test/captures/ and
- Get information for the input pcap file with capinfos
- Generate an ASCII hexdump with text2pcap
- Convert the ASCII hexdump back to pcap using text2pcap
- Get information for the output pcap file with capinfs
- Check that file type, encapsulation type, number of packets and data size
  in the output file are the same as in the input file

Change-Id: I659204fb0a46e9cd99d03eb666f55fac95ae053e
Reviewed-on: https://code.wireshark.org/review/11042
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-15 14:00:04 +00:00
Hadriel Kaplan dcaa64a050 Mergecap: add test suite for various merging scenarios
Add a test suite for mergecap (and indirectly capinfos I guess).
This is not exhaustive, but it's a start.

Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e
Reviewed-on: https://code.wireshark.org/review/10082
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19 04:27:42 +00:00
Gerald Combs b255d8a1a1 CMake: Update wslua build and test.
Process wslua/CMakeLists.txt using add_subdirectory instead of
include. Generate files in the build directory instead of the source
directory.

Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's
where init.lua looks for console.lua.

Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We
presumably want to test our source files and not files which may or
may not be in the system path.

When we're running from the build directory look for lua scripts in both
the Autotools and CMake build locations.

Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b
Reviewed-on: https://code.wireshark.org/review/7590
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12 16:37:51 +00:00
Evan Huus 5cb96a0eb5 test: default WS_QT_BIN_PATH to WS_BIN_PATH
it used to be SOURCE_DIR, which is still the fallback for WS_BIN_PATH, but this
way if you specify a custom WS_BIN_PATH it gets picked up for both

Change-Id: If9198565fc7b7b3911550fd200adb0f918622540
Reviewed-on: https://code.wireshark.org/review/6238
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02 16:08:20 +00:00
Gerald Combs dcbebe0eac Test suite: Start testing our output for valid UTF-8.
Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a
couple of the Bluetooth dissectors and X11 keysyms accordingly.

Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd
Reviewed-on: https://code.wireshark.org/review/6146
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30 21:20:28 +00:00
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 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
Gerald Combs 81963e7f1a Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.
Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9
Reviewed-on: https://code.wireshark.org/review/2664
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-25 23:02:55 +00:00
Evan Huus fca7b3f4f8 Check for lua by grepping the output of tshark -v
Grepping config.h doesn't work for out-of-tree builds.

Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9
Reviewed-on: https://code.wireshark.org/review/2389
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:32:18 +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
Evan Huus 1cd7828527 Various fixes to the Lua int64 code
- add casts to pacify certain buildbots
- skip test if lua isn't available

Change-Id: I614c05dca40cb848c87b361e4b3d3c4e94aafb9e
Reviewed-on: https://code.wireshark.org/review/97
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-04 00:59:07 +00:00
Evan Huus 4860e101c8 Slight simplification, inline a function only ever called once.
svn path=/trunk/; revision=52470
2013-10-09 17:24:16 +00:00
Evan Huus 087c885c66 More tweaking of test suite path variables, trying to make everything play
nicely on Windows and Linux both.

svn path=/trunk/; revision=52428
2013-10-06 23:29:59 +00:00
Evan Huus 62c230c7b1 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174
Reorg more of the test variables, still separating source and test directories.
More minor fixes from me.

svn path=/trunk/; revision=52412
2013-10-06 18:57:01 +00:00
Evan Huus e0cc11c92b From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174
Support running most tests out-of-tree. Use case is to have a source tree and
use a semi-unprivileged user to perform tests (to rule out interference).

From me:
- fix unit-test suite, it has to build the binaries it runs so it must
  more-or-less ignore the out-of-tree stuff
- fix name-res suite, just missing a path qualifier


svn path=/trunk/; revision=52397
2013-10-06 12:44:10 +00:00
Gerald Combs a8c728533d Add a test for rawshark.
svn path=/trunk/; revision=51494
2013-08-23 18:54:22 +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 f21274b7c2 Clobber our personal configuration directory on Windows.
svn path=/trunk/; revision=41860
2012-03-30 21:04:09 +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 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 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 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 f9fad8cd75 "tshark -D" writes to stderr now.
svn path=/trunk/; revision=37092
2011-05-12 17:49:15 +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 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
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
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
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
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 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 bf2696032c Now need to use interface #2 ??
svn path=/trunk/; revision=20590
2007-01-28 20:41:50 +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
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 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 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
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