forked from dan/liminix
extract common shell fns in tests
This commit is contained in:
parent
d8cc6ab61c
commit
55387b0ee3
|
@ -15,29 +15,6 @@ in pkgs.runCommand "check" {
|
|||
socat
|
||||
] ;
|
||||
} ''
|
||||
serverstatedir=$(mktemp -d -t routeros-XXXXXX)
|
||||
|
||||
killpid(){
|
||||
if test -e $1 && test -d /proc/`cat $1` ; then
|
||||
pid=$(cat $1)
|
||||
kill $pid
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup(){
|
||||
killpid $serverstatedir/pid
|
||||
test -n "$MPLCONFIGDIR" && test -d "$MPLCONFIGDIR" && rm -rf "$MPLCONFIGDIR"
|
||||
killpid foo.pid
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fatal(){
|
||||
err=$?
|
||||
echo "FAIL: command $(eval echo $BASH_COMMAND) exited with code $err"
|
||||
exit $err
|
||||
}
|
||||
trap fatal ERR
|
||||
|
||||
mkdir vm
|
||||
mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs
|
||||
expect ${./script.expect} >$out
|
||||
|
|
|
@ -19,24 +19,7 @@ in pkgs.runCommand "check" {
|
|||
rogue
|
||||
] ;
|
||||
} ''
|
||||
killpid(){
|
||||
if test -e $1 && test -d /proc/`cat $1` ; then
|
||||
pid=$(cat $1)
|
||||
kill $pid
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup(){
|
||||
killpid ./vm/pid
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
fatal(){
|
||||
err=$?
|
||||
echo "FAIL: command $(eval echo $BASH_COMMAND) exited with code $err"
|
||||
exit $err
|
||||
}
|
||||
trap fatal ERR
|
||||
. ${../test-helpers.sh}
|
||||
|
||||
mkdir vm
|
||||
LAN=user,hostfwd=tcp::2022-:22 mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs
|
||||
|
|
|
@ -23,26 +23,7 @@ serverstatedir=$(mktemp -d -t routeros-XXXXXX)
|
|||
# a sandbox with no $HOME, hence this environment variable
|
||||
export MPLCONFIGDIR=$(mktemp -d -t routeros-XXXXXX)
|
||||
|
||||
killpid(){
|
||||
if test -e $1 && test -d /proc/`cat $1` ; then
|
||||
pid=$(cat $1)
|
||||
kill $pid
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup(){
|
||||
killpid $serverstatedir/pid
|
||||
test -n "$MPLCONFIGDIR" && test -d "$MPLCONFIGDIR" && rm -rf "$MPLCONFIGDIR"
|
||||
killpid foo.pid
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fatal(){
|
||||
err=$?
|
||||
echo "FAIL: command $(eval echo $BASH_COMMAND) exited with code $err"
|
||||
exit $err
|
||||
}
|
||||
trap fatal ERR
|
||||
. ${../test-helpers.sh}
|
||||
|
||||
routeros $serverstatedir
|
||||
mkdir vm
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
killpid(){
|
||||
if test -e $1 && test -d /proc/`cat $1` ; then
|
||||
pid=$(cat $1)
|
||||
kill $pid
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup(){
|
||||
killpid $serverstatedir/pid
|
||||
test -n "$MPLCONFIGDIR" && test -d "$MPLCONFIGDIR" && rm -rf "$MPLCONFIGDIR"
|
||||
killpid foo.pid
|
||||
killpid ./vm/pid
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fatal(){
|
||||
err=$?
|
||||
echo "FAIL: command $(eval echo $BASH_COMMAND) exited with code $err"
|
||||
exit $err
|
||||
}
|
||||
trap fatal ERR
|
|
@ -15,23 +15,7 @@ in pkgs.runCommand "check" {
|
|||
socat
|
||||
] ;
|
||||
} ''
|
||||
killpid(){
|
||||
if test -e $1 && test -d /proc/`cat $1` ; then
|
||||
pid=$(cat $1)
|
||||
kill $pid
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup(){
|
||||
killpid ./vm/pid
|
||||
}
|
||||
trap cleanup EXIT
|
||||
fatal(){
|
||||
err=$?
|
||||
echo "FAIL: command $(eval echo $BASH_COMMAND) exited with code $err"
|
||||
exit $err
|
||||
}
|
||||
trap fatal ERR
|
||||
. ${../test-helpers.sh}
|
||||
|
||||
mkdir vm
|
||||
mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs
|
||||
|
|
Loading…
Reference in New Issue