mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 02:51:55 +00:00
tests: Tidy up the format_mount tests
- Consistently use env variables - Use simpler cleanup code Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
parent
59a085efc0
commit
a9538a57d4
@ -10,16 +10,15 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK=disk.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf ${NAME}-* ${DISK}
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
# Test code goes here
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})"
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
@ -10,16 +10,15 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK=disk.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf ${NAME}-* ${DISK}
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
# Test code goes here
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})"
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
@ -10,14 +10,13 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK=disk.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf test.yml || true
|
||||
rm -rf ${NAME}-* ${DISK} test.yml
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
# Test code goes here
|
||||
|
||||
if [ "${RT_OS}" = "osx" ]; then
|
||||
DEVICE="/dev/vda"
|
||||
else
|
||||
@ -25,8 +24,8 @@ else
|
||||
fi
|
||||
|
||||
sed -e "s,@DEVICE@,${DEVICE},g" test.yml.in > test.yml
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})"
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
@ -10,16 +10,16 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK=disk.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf ${NAME}-* ${DISK}
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
# Test code goes here
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})"
|
||||
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
@ -10,16 +10,15 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK=disk.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf ${NAME}-* ${DISK}
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
# Test code goes here
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})"
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
@ -10,16 +10,16 @@ set -e
|
||||
. "${RT_PROJECT_ROOT}/_lib/lib.sh"
|
||||
|
||||
NAME=test-format
|
||||
DISK1=disk1.img
|
||||
DISK2=disk2.img
|
||||
|
||||
clean_up() {
|
||||
find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \;
|
||||
rm -rf ${NAME}-* ${DISK1} ${DISK2}
|
||||
}
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
# Test code goes here
|
||||
moby build -name ${NAME} -format kernel+initrd test.yml
|
||||
RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M -disk file=${NAME}2.img,size=512M ${NAME})"
|
||||
moby build -format kernel+initrd -name ${NAME} test.yml
|
||||
RESULT="$(linuxkit run -disk file=${DISK1},size=512M -disk file=${DISK2},size=512M ${NAME})"
|
||||
echo "${RESULT}"
|
||||
echo "${RESULT}" | grep -q "suite PASSED"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user