802.1ah: call subdissectors even when we have no tree.

[metze/wireshark/wip.git] / test / test.sh

diff --git a/test/test.sh b/test/test.sh
index 00b71e7679d8a2c46d514759a0ac43bdb472a36a..73a2007b0d751a9f37a7674842c3d7c212d53739 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -109,6 +109,7 @@ source $TESTS_DIR/suite-decryption.sh
 source $TESTS_DIR/suite-nameres.sh
 source $TESTS_DIR/suite-wslua.sh
 source $TESTS_DIR/suite-mergecap.sh
+source $TESTS_DIR/suite-text2pcap.sh
 
 test_cleanup() {
        if [ $TEST_OUTDIR_CLEAN = 1 ]; then
@@ -170,6 +171,7 @@ test_suite() {
        test_suite_add "Lua API" wslua_suite
        test_suite_add "Mergecap" mergecap_suite
        test_suite_add "File formats" fileformats_suite
+       test_suite_add "Text2pcap" text2pcap_suite
 }
 
 
@@ -218,6 +220,9 @@ if [ -n "$RUN_SUITE" ] ; then
                "wslua")
                        test_suite_run "Lua API" wslua_suite
                        exit $? ;;
+               "text2pcap")
+                       test_suite_run "Text2pcap" text2pcap_suite
+                       exit $? ;;
        esac
 fi
 
@@ -234,14 +239,25 @@ do
 
        #echo $current_title $current_function
        test_suite_show "${menu_title[MENU_LEVEL]}" "${menu_function[MENU_LEVEL]}"
-       echo "1-$TEST_STEPS  : Select item"
-       echo "Enter: Test All"
+       if [ $MENU_LEVEL -gt 0 ]; then
+               echo "T or Enter:  Run suite"
+       else
+       echo "1-$TEST_STEPS : Select suite"
+       fi
+
+       # DBG
+       #echo "Menu level: $MENU_LEVEL"
+       #echo "Menu Title: ${menu_title[MENU_LEVEL]}"
+       #echo "Menu Function: ${menu_function[MENU_LEVEL]}"
+       #echo "Test title size: ${#test_title[@]}"
+       # END DBG
+
        if [[ ! $MENU_LEVEL -eq 0 ]]; then
                echo "U    : Up"
        fi
        echo "Q    : Quit"
        echo ""
-       read -n1 key
+       read key
        newl=$'\x0d'
        echo "$newl----------------------------------------------------------------------"
 
@@ -266,52 +282,16 @@ done
                        #echo "----------------------------------------------------------------------"
                fi
        ;;
-               "1")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[1]}
-               menu_function[MENU_LEVEL]=${test_function[1]}
-       ;;
-               "2")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[2]}
-               menu_function[MENU_LEVEL]=${test_function[2]}
-       ;;
-               "3")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[3]}
-               menu_function[MENU_LEVEL]=${test_function[3]}
-       ;;
-               "4")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[4]}
-               menu_function[MENU_LEVEL]=${test_function[4]}
-       ;;
-               "5")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[5]}
-               menu_function[MENU_LEVEL]=${test_function[5]}
-       ;;
-               "6")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[6]}
-               menu_function[MENU_LEVEL]=${test_function[6]}
-       ;;
-               "7")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[7]}
-               menu_function[MENU_LEVEL]=${test_function[7]}
-       ;;
-               "8")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[8]}
-               menu_function[MENU_LEVEL]=${test_function[8]}
-       ;;
-               "9")
-               let "MENU_LEVEL += 1"
-               menu_title[MENU_LEVEL]=${test_title[9]}
-               menu_function[MENU_LEVEL]=${test_function[9]}
+               ## Now we're only interested in digits when the menu level is at the top (0)
+               [0-9]*)
+               if [ $MENU_LEVEL -eq 0 ]; then
+                       if [ $key -le ${#test_title[@]} ]; then
+                               let "MENU_LEVEL += 1"
+                               menu_title[MENU_LEVEL]=${test_title[$key]}
+                               menu_function[MENU_LEVEL]=${test_function[$key]}
+                       fi
+               fi
        ;;
-
        esac
 done