osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Graham Bloice 2015-09-28 17:07:37 +01:00
parent 1e8ad87d46
commit 009b40ba06
1 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
test/test.sh
View File

@ -234,14 +234,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 +277,16 @@ done
#echo "----------------------------------------------------------------------"
fi
;;
"1")
let "MENU_LEVEL += 1"
menu_title[MENU_LEVEL]=${test_title[1]}
menu_function[MENU_LEVEL]=${test_function[1]}
## 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
;;
"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]}
;;
esac
done