Commit 8e57a58d authored by Cedric Roux's avatar Cedric Roux

fix run_enb_ue_virt_noS1 and run_enb_ue_virt_s1

Problems reported by Jorge Muñoz Castañer <jorgem@gti.uvigo.es>.

- use Rel14 binaries (those are produced by default)
- let -x option work to have graphical output
- fix VCD missing 'echo'
parent 8625a867
...@@ -150,7 +150,7 @@ function main() ...@@ -150,7 +150,7 @@ function main()
# -u | --num-ue ) # -u | --num-ue )
-V | --vcd) -V | --vcd)
"setting gtk-wave output" echo "setting gtk-wave output"
exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd" exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd"
shift ; shift ;
;; ;;
...@@ -164,6 +164,11 @@ function main() ...@@ -164,6 +164,11 @@ function main()
exe_arguments="$exe_arguments -n $2" exe_arguments="$exe_arguments -n $2"
shift 2; shift 2;
;; ;;
-x | --xforms)
echo "running with xforms"
exe_arguments="$exe_arguments --xforms"
shift 1;
;;
*) *)
echo "Unknown option $1" echo "Unknown option $1"
help help
...@@ -212,11 +217,11 @@ function main() ...@@ -212,11 +217,11 @@ function main()
fi fi
if [ $run_gdb -eq 0 ]; then if [ $run_gdb -eq 0 ]; then
exec $SUDO $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel10 $exe_arguments | tee /tmp/enb_ue_nos1.log.txt exec $SUDO $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel14 $exe_arguments | tee /tmp/enb_ue_nos1.log.txt
else else
touch ~/.gdb_enb_ue_nos1 touch ~/.gdb_enb_ue_nos1
chmod 777 ~/.gdb_enb_ue_nos1 chmod 777 ~/.gdb_enb_ue_nos1
echo "file $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel10" > ~/.gdb_enb_ue_nos1 echo "file $OPENAIR_DIR/targets/bin/oaisim_nos1.Rel14" > ~/.gdb_enb_ue_nos1
echo "set args $exe_arguments" >> ~/.gdb_enb_ue_nos1 echo "set args $exe_arguments" >> ~/.gdb_enb_ue_nos1
echo "run" >> ~/.gdb_enb_ue_nos1 echo "run" >> ~/.gdb_enb_ue_nos1
cat ~/.gdb_enb_ue_nos1 cat ~/.gdb_enb_ue_nos1
......
...@@ -174,7 +174,7 @@ function main() ...@@ -174,7 +174,7 @@ function main()
;; ;;
-V | --vcd) -V | --vcd)
"setting gtk-wave output" echo "setting gtk-wave output"
exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd" exe_arguments="$exe_arguments -V /tmp/oai_gtk_wave.vcd"
shift ; shift ;
;; ;;
...@@ -183,6 +183,11 @@ function main() ...@@ -183,6 +183,11 @@ function main()
exe_arguments="$exe_arguments -P wireshark" exe_arguments="$exe_arguments -P wireshark"
shift 2; shift 2;
;; ;;
-x | --xforms)
echo "running with xforms"
exe_arguments="$exe_arguments --xforms"
shift 1;
;;
*) *)
echo "Unknown option $1" echo "Unknown option $1"
help help
...@@ -258,11 +263,11 @@ function main() ...@@ -258,11 +263,11 @@ function main()
fi fi
if [ $run_gdb -eq 0 ]; then if [ $run_gdb -eq 0 ]; then
exec $OPENAIR_DIR/targets/bin/oaisim.Rel10 $exe_arguments | tee /tmp/enb_ue_s1.log.txt exec $OPENAIR_DIR/targets/bin/oaisim.Rel14 $exe_arguments | tee /tmp/enb_ue_s1.log.txt
else else
touch ~/.gdb_enb_ue_s1 touch ~/.gdb_enb_ue_s1
chmod 777 ~/.gdb_enb_ue_s1 chmod 777 ~/.gdb_enb_ue_s1
echo "file $OPENAIR_DIR/targets/bin/oaisim.Rel10" > ~/.gdb_enb_ue_s1 echo "file $OPENAIR_DIR/targets/bin/oaisim.Rel14" > ~/.gdb_enb_ue_s1
echo "set args $exe_arguments" >> ~/.gdb_enb_ue_s1 echo "set args $exe_arguments" >> ~/.gdb_enb_ue_s1
echo "run" >> ~/.gdb_enb_ue_s1 echo "run" >> ~/.gdb_enb_ue_s1
cat ~/.gdb_enb_ue_s1 cat ~/.gdb_enb_ue_s1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment