diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-03-30 17:51:54 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-03-30 17:51:54 +0000 |
commit | 1bf7a61ac02c772c9399aff87a44843aba90366d (patch) | |
tree | c00103f0c05eb604dfb18ef09cbcc842ea705495 /test/test.sh | |
parent | 17ce01b48d3dff111bc6c1333855865ea9ccb004 (diff) |
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
Diffstat (limited to 'test/test.sh')
-rwxr-xr-x | test/test.sh | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/test/test.sh b/test/test.sh index b79a6f3a1b..03186902f1 100755 --- a/test/test.sh +++ b/test/test.sh @@ -49,8 +49,15 @@ if [ $PRINT_USAGE -ne 0 ] ; then Usage: $THIS [-c] [-h] [-s <suite>] -c: Disable color output -h: Print this message and exit - -s: Run a suite. Must be one of: all, capture, clopts, io, or + -s: Run a suite. Must be one of: + all + capture + clopts + decryption + fileformats + io prerequisites + unittests FIN exit 0 fi @@ -63,6 +70,7 @@ source suite-io.sh source suite-capture.sh source suite-unittests.sh source suite-fileformats.sh +source suite-decryption.sh #check prerequisites @@ -95,6 +103,7 @@ test_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 } @@ -122,12 +131,21 @@ if [ -n "$RUN_SUITE" ] ; then "clopts") test_suite_run "Command line options" clopt_suite exit $? ;; + "decryption") + test_suite_run "Decryption" decryption_suite + exit $? ;; + "fileformats") + test_suite_run "File formats" fileformats_suite + exit $? ;; "io") test_suite_run "File I/O" io_suite exit $? ;; "prerequisites") test_suite_run "Prerequisites" prerequisites_suite exit $? ;; + "unittests") + test_suite_run "Unit tests" unittests_suite + exit $? ;; esac fi |