ethereal to wireshark conversion
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 17 Jun 2006 11:49:03 +0000 (11:49 +0000)
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 17 Jun 2006 11:49:03 +0000 (11:49 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18495 f5534014-38df-0310-8fa8-9805f1628bb7

test/README.test
test/config.sh
test/suite-capture.sh
test/suite-io.sh

index 4dfcf2b81f9fe1529398e354a4bff0b1069e87c8..ce50e18e581c2275a4194f341c840f222d8981ab 100644 (file)
@@ -6,14 +6,14 @@ What is it?
 -----------
 This is basically a collection of bash scripts to test the command line options of:
 
- - Ethereal
+ - Wireshark
  - TShark
  - Dumpcap 
 
 Motivation
 ----------
 
-The command line options of Ethereal and the companion command line tools are 
+The command line options of Wireshark and the companion command line tools are 
 numerous. This makes it hard to find newly introduced bugs doing manual testing 
 (try and error) with source code changes.
 
@@ -38,7 +38,7 @@ Prerequisites
 What you'll need (to do):
 
  - THE LATEST DEVELOPER BUILDS (the 0.10.13 release won't work)!
- - obviously, compile the programs (ethereal, ...) to be tested
+ - obviously, compile the programs (wireshark, ...) to be tested
  - have a bash (cygwin should do well)
  - you'll need a network interface with some network traffic 
    (so you can run the capture tests)
index 62f180109b10d97975b60e79c8b77105a0f412e8..b103d2829c1ef1a95e585a004168550c5bf44337 100644 (file)
@@ -27,7 +27,7 @@
 ETH_BIN_PATH=../Debug_GTK2
 
 # Tweak the following to your liking.
-WIRESHARK=$ETH_BIN_PATH/ethereal
+WIRESHARK=$ETH_BIN_PATH/wireshark
 TSHARK=$ETH_BIN_PATH/tshark
 CAPINFOS=$ETH_BIN_PATH/capinfos
 DUMPCAP=$ETH_BIN_PATH/dumpcap
index 1a107bdc7994e89df2509b9a821c08e089903dff..0fc4d9fe902d6392c22adca5f4da9dec5197f833 100644 (file)
@@ -185,13 +185,13 @@ capture_step_snapshot() {
        fi
 }
 
-ethereal_capture_suite() {
+wireshark_capture_suite() {
        # Q: quit after cap, k: start capture immediately
        DUT="$WIRESHARK -Q -k"
        test_step_add "Capture 10 packets" capture_step_10packets
-       # piping to stdout doesn't work with Ethereal and capturing!
+       # piping to stdout doesn't work with Wireshark and capturing!
        #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout
-       # read filter doesn't work with Ethereal and capturing!
+       # read filter doesn't work with Wireshark and capturing!
        #test_step_add "Capture read filter (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_read_filter
        test_step_add "Capture snapshot length 68 bytes (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_snapshot
 }
@@ -226,6 +226,6 @@ capture_suite() {
        test_step_set_post capture_cleanup_step
        test_remark_add "Capture - need some traffic on interface: \"$TRAFFIC_CAPTURE_IFACE\""
        test_suite_add "TShark capture" tshark_capture_suite
-       test_suite_add "Ethereal capture" ethereal_capture_suite
+       test_suite_add "Wireshark capture" wireshark_capture_suite
        test_suite_add "Dumpcap capture" dumpcap_capture_suite
 }
index 51eb98f8236bb4eebd0ef05cf6381c73166535ca..909cff804ed4fc5ef3580127660029bbd415fc49 100644 (file)
@@ -125,7 +125,7 @@ io_step_input_piping() {
        fi
 }
 
-ethereal_io_suite() {
+wireshark_io_suite() {
        # Q: quit after cap, k: start capture immediately
        DUT="$WIRESHARK"
        test_step_add "Input file" io_step_input_file
@@ -156,6 +156,6 @@ io_suite() {
        test_step_set_pre io_cleanup_step
        test_step_set_post io_cleanup_step
        test_suite_add "TShark file I/O" tshark_io_suite
-       #test_suite_add "Ethereal file I/O" ethereal_io_suite
+       #test_suite_add "Wireshark file I/O" wireshark_io_suite
        #test_suite_add "Dumpcap file I/O" dumpcap_io_suite
 }