jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Allow passing more arguments to vm-run.sh

Browse source 
The script is currently limited by the maximum kernel command line
length and if that's exceeded the kernel panics at boot. Fix this by
writing the arguments to a file and reading it in the VM.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-11-30 11:59:09 +01:00 committed by Jouni Malinen
parent 32c02261dd
commit 23fcfd6004
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/hwsim/vm/inside.sh
View file

@ -22,7 +22,7 @@ sysctl kernel.panic=1
TESTDIR=$(sed 's/.*testdir=\([^ ]*\) .*/\1/' /proc/cmdline) TESTDIR=$(sed 's/.*testdir=\([^ ]*\) .*/\1/' /proc/cmdline)
TIMEWARP=$(sed 's/.*timewarp=\([^ ]*\) .*/\1/' /proc/cmdline) TIMEWARP=$(sed 's/.*timewarp=\([^ ]*\) .*/\1/' /proc/cmdline)
EPATH=$(sed 's/.*EPATH=\([^ ]*\) .*/\1/' /proc/cmdline) EPATH=$(sed 's/.*EPATH=\([^ ]*\) .*/\1/' /proc/cmdline)
ARGS=$(sed 's/.*ARGS=//' /proc/cmdline) ARGS=$(sed 's/.*ARGS=\([^ ]*\)\( \|$\).*/\1/' /proc/cmdline)
# create /dev entries we need # create /dev entries we need
mknod -m 660 /dev/ttyS0 c 4 64 mknod -m 660 /dev/ttyS0 c 4 64
@ -78,6 +78,10 @@ ip link set lo up
mkdir /tmp/logs mkdir /tmp/logs
mount -t 9p -o trans=virtio,rw logshare /tmp/logs mount -t 9p -o trans=virtio,rw logshare /tmp/logs
# allow access to any outside directory (e.g. /tmp) we also have
mkdir /tmp/host
mount --bind / /tmp/host
if [ "$TIMEWARP" = "1" ] ; then if [ "$TIMEWARP" = "1" ] ; then
( (
while sleep 1 ; do while sleep 1 ; do
@ -107,7 +111,7 @@ else
dbus-daemon --config-file=$TESTDIR/vm/dbus.conf --fork dbus-daemon --config-file=$TESTDIR/vm/dbus.conf --fork
cd $TESTDIR cd $TESTDIR
./run-all.sh $ARGS </dev/ttyS0 >/dev/ttyS0 2>&1 ./run-all.sh $(cat /tmp/host$ARGS) </dev/ttyS0 >/dev/ttyS0 2>&1
if test -d /sys/kernel/debug/gcov ; then if test -d /sys/kernel/debug/gcov ; then
cp -ar /sys/kernel/debug/gcov /tmp/logs/ cp -ar /sys/kernel/debug/gcov /tmp/logs/
# these are broken as they're updated while being read ... # these are broken as they're updated while being read ...

13
tests/hwsim/vm/vm-run.sh
View file

@ -113,6 +113,17 @@ for kvmprog in kvm qemu-kvm; do
fi fi
done done
argsfile=$(mktemp)
if [ $? -ne 0 ] ; then
exit 2
fi
function finish {
rm -f $argsfile
}
trap finish EXIT
echo "$RUN_TEST_ARGS" > $argsfile
$KVM \ $KVM \
-kernel $KERNEL -smp 4 \ -kernel $KERNEL -smp 4 \
$KVMARGS -m $MEMORY -nographic \ $KVMARGS -m $MEMORY -nographic \
@ -121,7 +132,7 @@ $KVM \
-fsdev local,security_model=none,id=fsdev-logs,path="$LOGDIR",writeout=immediate \ -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 \ -device virtio-9p-pci,id=fs-logs,fsdev=fsdev-logs,mount_tag=logshare \
-monitor null -serial stdio -serial file:$LOGDIR/console \ -monitor null -serial stdio -serial file:$LOGDIR/console \
-append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 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" -append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$argsfile"
if [ $CODECOV = "yes" ]; then if [ $CODECOV = "yes" ]; then
echo "Preparing code coverage reports" echo "Preparing code coverage reports"