diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-17 19:22:42 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-19 04:27:42 +0000 |
| commit | dcaa64a0508a23a2d8df4304a5a31cc4d53a6e90 (patch) | |
| tree | 099429d4c4305e4ff0c90889e10bc8a82c18877c /test/test.sh | |
| parent | d64ad1de91cb8303ce5b76faf0c5bdc0bf09a930 (diff) | |
| download | wireshark-dcaa64a0508a23a2d8df4304a5a31cc4d53a6e90.tar.gz | |
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>
Diffstat (limited to 'test/test.sh')
| -rwxr-xr-x | test/test.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test.sh b/test/test.sh index 8ab9259d45..00b71e7679 100755 --- a/test/test.sh +++ b/test/test.sh @@ -108,6 +108,7 @@ source $TESTS_DIR/suite-fileformats.sh source $TESTS_DIR/suite-decryption.sh source $TESTS_DIR/suite-nameres.sh source $TESTS_DIR/suite-wslua.sh +source $TESTS_DIR/suite-mergecap.sh test_cleanup() { if [ $TEST_OUTDIR_CLEAN = 1 ]; then @@ -126,7 +127,7 @@ trap test_cleanup EXIT test_step_prerequisites() { NOTFOUND=0 - for i in "$WIRESHARK" "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do + for i in "$WIRESHARK" "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$MERGECAP" "$DUMPCAP" ; do if [ ! -x $i ]; then echo "Couldn't find $i" NOTFOUND=1 @@ -164,10 +165,11 @@ test_suite() { test_suite_add "File I/O" io_suite test_suite_add "Capture" capture_suite test_suite_add "Unit tests" unittests_suite - test_suite_add "File formats" fileformats_suite test_suite_add "Decryption" decryption_suite test_suite_add "Name Resolution" name_resolution_suite test_suite_add "Lua API" wslua_suite + test_suite_add "Mergecap" mergecap_suite + test_suite_add "File formats" fileformats_suite } |