Commit Graph

48 Commits

Author SHA1 Message Date
Peter Wu 7f6a4926d2 test: make GTK support optional
Current Ubuntu buildbot is failing because GTK support was removed.
Tests should not fail if GTK is not available, so make it optional.

Change-Id: I1640c8bcea5208299f6846eb366e105c39a3ebf3
Reviewed-on: https://code.wireshark.org/review/18345
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21 20:38:46 +00:00
Peter Wu 9b91e64fee test: ensure temporary directory outside source tree
The whole point of using mktemp is to get a temporary directory outside
the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the
invocation for *BSD (including OS X), but by adding a template it
dropped the implicit --tmpdir option for GNU mktemp on Linux..

Use the GNU mktemp invocation and if it fails (for example, because a
template is expected for BSD/OS X), provide a template.

Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713
Reviewed-on: https://code.wireshark.org/review/16178
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-27 22:42:01 +00:00
João Valverde aedc4af6c1 Use absolute path for test suite TEST_OUTDIR
Error out if it can't be created.

Change-Id: I1a087f0e0cc064be7a417b9a2e66cf3c940e02fa
Reviewed-on: https://code.wireshark.org/review/14565
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 15:15:22 +00:00
Guy Harris e01f8fb3ad Explicitly specify the template for the mktemp command.
Not all versions of mktemp support omitting the template; in particular,
the one provided by some BSD-flavored OSes don't.

Change-Id: I657e002559dce165c677a473aa10bb17cc506037
Reviewed-on: https://code.wireshark.org/review/12592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13 18:05:36 +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
Graham Bloice 009b40ba06 Fix tests to allow selection of suite 10
The tests only allowed a single character suite selection, which
prevented suite 10 from being run on its own.

Modified test.sh to now require a newline in addition to the input
so that a 2 digit number can be entered.

Also fixed test display to remove illusion that an individual step
could be run.  Only whole suites can be run.

Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54
Reviewed-on: https://code.wireshark.org/review/10676
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-09-28 20:28:25 +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
Guy Harris 7cdd22f422 Try to catch TShark crashing and get a stack trace.
It's currently crashing in the Solaris buildbot when we do "tshark -v";
hopefully this will give us something more useful than

  test.sh: line 144: 21543 Abort                   (core dumped) $TSHARK -v

  "Version information" Failed!
  Failed to print version information
  Binary file ./core matches

as a diagnostic.

Change-Id: I278c8dd9f6acf5ddfa83bc0a7f3f7a3c48577ac2
Reviewed-on: https://code.wireshark.org/review/9052
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-23 07:21:49 +00:00
Graham Bloice d7bce33140 Fix Cygwin path
Fix the Cygwin path added for tests so that Cygwin comes after the
existing path and that the correct link command is found for exntest.

Same change to runa2x.sh to be consistent.

Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24
Reviewed-on: https://code.wireshark.org/review/6503
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-12 12:40:04 +00:00
Graham Bloice a49e1d54d9 Make running the tests a little easier on Windows
1.  Set the igncr option a little differently, this is the preferred
    way according to the latest Cygwin bash update announcement
    (See https://sourceware.org/ml/cygwin-announce/2014-10/msg00015.html, Sect 4a)
    The previous way didn't work for me.
2.  Ensure /usr/bin is on the path if running under Cygwin.
    I really don't want Cygwin on my normal paths, the build process
    adds if required, so this change makes the test scripts do the same.

Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79
Reviewed-on: https://code.wireshark.org/review/6243
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-12 10:22:40 +00:00
Graham Bloice e7d0cdc061 Fix lua tests on Windows
Convert TEST_DIR path to a Windows path, this is used in all the lua tests.
Fix a typo

Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b
Reviewed-on: https://code.wireshark.org/review/6235
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-02 16:49:40 +00:00
Evan Huus 887d198361 test: improve check for out-of-tree tests
Rather than running `cd` and letting it potentially fail, just use the `-d` flag
to test that `run` exists and is a directory. Avoids useless stderr output.

Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba
Reviewed-on: https://code.wireshark.org/review/6239
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02 16:12:45 +00:00
Joerg Mayer 27fa202b5e Make it easier to run tests out of tree.
Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac
Reviewed-on: https://code.wireshark.org/review/5148
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02 15:00:03 +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 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
Hadriel Kaplan fe769e7350 Add 4 more test scripts for Lua, and its own testsuite menu
This adds test scripts for verifying Pinfo, Address, Field, FieldInfo, NSTime
and Listener classes/functions.  It also moves Lua test scripts out of
unittests and into its own new testsuite.

Change-Id: I65c238fd459efb96db3f8f9145842cd038dea7c7
Reviewed-on: https://code.wireshark.org/review/270
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20 18:42:13 +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 0777f96c63 Another path and ordering tweak.
svn path=/trunk/; revision=52430
2013-10-06 23:39: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 d5e30ea820 Fix the name resolution tests so that they run on Windows. Enable them
by default. Remove some unused code.

svn path=/trunk/; revision=49661
2013-05-31 22:32:14 +00:00
Gerald Combs bfe9967fc8 nameres.hosts_file_handling shouldn't affect loading the profile "hosts"
file. That should be loaded no matter what if we have name resolution
enabled.

Add a name resolution test suite. Currently disabled until I can test it
on Windows.

svn path=/trunk/; revision=49657
2013-05-31 21:40:26 +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 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 005e724d27 Fix the location of dhcp.pcap.
svn path=/trunk/; revision=41857
2012-03-30 18:19:35 +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
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
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
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
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 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 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
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 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