tests: uml: Request non-raw serial ports

[thirdparty/hostap.git] / tests / hwsim / vm / vm-run.sh

diff --git a/tests/hwsim/vm/vm-run.sh b/tests/hwsim/vm/vm-run.sh
index 77703bf587586f61e2d187da174e2ff9dec0f58c..712dfaac511fb9f698131f7c1b4db2bb7ddf8345 100755 (executable)
--- a/tests/hwsim/vm/vm-run.sh
+++ b/tests/hwsim/vm/vm-run.sh
@@ -6,10 +6,14 @@ if [ -z "$TESTDIR" ] ; then
        TESTDIR=$(pwd)/../
 fi
 
-LOGS=/tmp/hwsim-test-logs
+if [ -n "$HWSIM_TEST_LOG_DIR" ] ; then
+       LOGS="$HWSIM_TEST_LOG_DIR"
+else
+       LOGS=/tmp/hwsim-test-logs
+fi
 
 # increase the memory size if you want to run with valgrind, 512 MB works
-MEMORY=128
+MEMORY=256
 
 # Some ubuntu systems (notably 12.04) have issues with this - since the guest
 # mounts as read-only it should be safe to not specify ,readonly. Override in
@@ -36,7 +40,18 @@ if [ -z "$KERNEL" ] && [ -z "$KERNELDIR" ] ; then
        exit 2
 fi
 if [ -z "$KERNEL" ] ; then
-       KERNEL=$KERNELDIR/arch/x86_64/boot/bzImage
+       if [ -e $KERNELDIR/arch/x86_64/boot/bzImage ]; then
+               KERNEL=$KERNELDIR/arch/x86_64/boot/bzImage
+       elif [ -e $KERNELDIR/linux ]; then
+               KERNEL=$KERNELDIR/linux
+       else
+               echo "No suitable kernel image found from KERNELDIR"
+               exit 2
+       fi
+fi
+if [ ! -e $KERNEL ]; then
+       echo "Kernel image not found: $KERNEL"
+       exit 2
 fi
 
 
@@ -47,6 +62,8 @@ TIMESTAMP=$(date +%s)
 DATE=$TIMESTAMP
 CODECOV=no
 TIMEWARP=0
+TELNET_QEMU=
+TELNET_ARG=0
 DELAY=0
 CODECOV_DIR=
 while [ "$1" != "" ]; do
@@ -69,6 +86,11 @@ while [ "$1" != "" ]; do
                --timewrap ) shift
                        TIMEWARP=1
                        ;;
+               --telnet ) shift
+                       TELNET_ARG=1
+                       TELNET_QEMU="-net nic,model=virtio -net user,id=telnet,restrict=on,net=172.16.0.0/24,hostfwd=tcp:127.0.0.1:$1-:23"
+                       shift
+                       ;;
                --delay ) shift
                        DELAY=$1
                        shift
@@ -82,6 +104,8 @@ done
 
 LOGDIR=$LOGS/$DATE
 mkdir -p $LOGDIR
+rm -f $LOGS/latest
+ln -s $LOGDIR $LOGS/latest
 
 if [ -n "$CODECOV_DIR" ]; then
     cp -a $CODECOV_DIR/alt-wpa_supplicant $LOGDIR
@@ -101,15 +125,74 @@ fi
 
 echo "Starting test run in a virtual machine"
 
-kvm \
-       -kernel $KERNEL -smp 4 \
-       $KVMARGS -m $MEMORY -nographic \
-       -fsdev local,security_model=none,id=fsdev-root,path=/$ROTAG \
-       -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=/dev/root \
-       -fsdev local,security_model=none,id=fsdev-logs,path="$LOGDIR",writeout=immediate \
-       -device virtio-9p-pci,id=fs-logs,fsdev=fsdev-logs,mount_tag=logshare \
-       -monitor null -serial stdio -serial file:$LOGDIR/console \
-       -append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=6 init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$RUN_TEST_ARGS"
+if [ -x $KERNEL ]; then
+       unset KVM
+else
+       KVM=kvm
+       for kvmprog in kvm qemu-kvm; do
+               if $kvmprog --version &> /dev/null; then
+                       KVM=$kvmprog
+                       break
+               fi
+       done
+fi
+
+argsfile=$(mktemp)
+if [ $? -ne 0 ] ; then
+       exit 2
+fi
+function finish {
+       rm -f $argsfile
+}
+trap finish EXIT
+
+echo "$RUN_TEST_ARGS" > $argsfile
+
+A="mac80211_hwsim.support_p2p_device=0 "
+A+="mac80211_hwsim.channels=$CHANNELS "
+A+="mac80211_hwsim.radios=7 "
+A+="cfg80211.dyndbg=+p "
+A+="mac80211.dyndbg=+p "
+A+="mac80211_hwsim.dyndbg=+p "
+A+="init=$CMD "
+A+="testdir=$TESTDIR "
+A+="timewarp=$TIMEWARP "
+A+="TELNET=$TELNET_ARG "
+A+="EPATH=$EPATH "
+A+="ARGS=$argsfile "
+A+="console=$KVMOUT "
+A+="ro"
+
+if [ -z $KVM ]; then
+       $KERNEL \
+            mem=${MEMORY}M \
+            LOGDIR=$LOGDIR \
+            time-travel=inf-cpu \
+            $A \
+            root=none hostfs=/ rootfstype=hostfs rootflags=/ \
+            ssl0=fd:0,fd:1 \
+            ssl1=fd:100 \
+            ssl-non-raw \
+            100<>$LOGDIR/console 2>&1 | \
+           sed -u '0,/VM has started up/d'
+else
+       $KVM \
+           -kernel $KERNEL \
+           -smp 4 \
+           $KVMARGS \
+           -m $MEMORY \
+           -nographic \
+           -fsdev local,security_model=none,id=fsdev-root,path=/$ROTAG \
+           -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=/dev/root \
+           -fsdev local,security_model=none,id=fsdev-logs,path="$LOGDIR",writeout=immediate \
+           -device virtio-9p-pci,id=fs-logs,fsdev=fsdev-logs,mount_tag=logshare \
+           -monitor null \
+           -serial stdio \
+           -serial file:$LOGDIR/console \
+           $TELNET_QEMU \
+           -append "$A root=/dev/root rootflags=trans=virtio,version=9p2000.u rootfstype=9p" | \
+           sed -u '0,/VM has started up/d'
+fi
 
 if [ $CODECOV = "yes" ]; then
     echo "Preparing code coverage reports"
@@ -119,7 +202,7 @@ fi
 
 echo
 echo "Test run completed"
-echo "Logfiles are at $LOGDIR"
+echo "Logfiles are at $LOGDIR ($LOGS/latest)"
 if [ $CODECOV = "yes" ]; then
     echo "Code coverage report:"
     echo "file://$LOGDIR/lcov/index.html"