aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: sim_arduplane.sh works with a range of terminal types

Browse Source
This commit is contained in:
Mike McCauley 2014-03-02 19:55:07 +10:00 committed by Andrew Tridgell
parent 7eb7f8b3ab
commit 3a714d5c45
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tools/autotest/sim_arduplane.sh
View File

@ -6,6 +6,23 @@ SIMHOME="-35.363261,149.165230,584,353"
# check the instance number to allow for multiple copies of the sim running at once # check the instance number to allow for multiple copies of the sim running at once
INSTANCE=0 INSTANCE=0
# Try to run a command in an appropriate type of terminal window
# depending on whats available
# Sigh: theres no common way of handling command line args :-(
function run_in_terminal_window()
{
if [ -x /usr/bin/konsole ]; then
/usr/bin/konsole --hold -e $*
elif [ -x /usr/bin/gnome-terminal ]; then
/usr/bin/gnome-terminal -e "$*"
elif [ -x /usr/bin/xterm ]; then
/usr/bin/xterm -hold -e $* &
else
# out of options: run in the background
$* &
fi
}
# parse options. Thanks to http://wiki.bash-hackers.org/howto/getopts_tutorial # parse options. Thanks to http://wiki.bash-hackers.org/howto/getopts_tutorial
while getopts ":I:" opt; do while getopts ":I:" opt; do
case $opt in case $opt in
@ -45,12 +62,12 @@ make clean sitl
tfile=$(mktemp) tfile=$(mktemp)
echo r > $tfile echo r > $tfile
#gnome-terminal -e "gdb -x $tfile --args /tmp/ArduPlane.build/ArduPlane.elf" #run_in_terminal_window gdb -x $tfile --args /tmp/ArduPlane.build/ArduPlane.elf
gnome-terminal -e "/tmp/ArduPlane.build/ArduPlane.elf -I$INSTANCE" run_in_terminal_window /tmp/ArduPlane.build/ArduPlane.elf -I$INSTANCE
#gnome-terminal -e "valgrind -q /tmp/ArduPlane.build/ArduPlane.elf" #run_in_terminal_window valgrind -q /tmp/ArduPlane.build/ArduPlane.elf
sleep 2 sleep 2
rm -f $tfile rm -f $tfile
gnome-terminal -e "../Tools/autotest/jsbsim/runsim.py --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT" run_in_terminal_window ../Tools/autotest/jsbsim/runsim.py --home=$SIMHOME --simin=$SIMIN_PORT --simout=$SIMOUT_PORT --fgout=$FG_PORT
sleep 2 sleep 2
popd popd