check_result_qemu() {
ret=1
- mkdir -p $TESTDIR/root
- mount ${LOOPDEV}p1 $TESTDIR/root
- [[ -e $TESTDIR/root/testok ]] && ret=0
- [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
+ mkdir -p $initdir
+ mount ${LOOPDEV}p1 $initdir
+ [[ -e $initdir/testok ]] && ret=0
+ [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
- mount /dev/mapper/varcrypt $TESTDIR/root/var
- cp -a $TESTDIR/root/var/log/journal $TESTDIR
- umount $TESTDIR/root/var
- umount $TESTDIR/root
+ mount /dev/mapper/varcrypt $initdir/var
+ cp -a $initdir/var/log/journal $TESTDIR
+ umount $initdir/var
+ umount $initdir
cryptsetup luksClose /dev/mapper/varcrypt
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal
cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 ${LOOPDEV}p2 $TESTDIR/keyfile
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
mkfs.ext4 -L var /dev/mapper/varcrypt
- mkdir -p $TESTDIR/root/var
- mount /dev/mapper/varcrypt $TESTDIR/root/var
+ mkdir -p $initdir/var
+ mount /dev/mapper/varcrypt $initdir/var
# Create what will eventually be our root filesystem onto an overlay
(
}
cleanup_root_var() {
- ddebug "umount $TESTDIR/root/var"
- mountpoint $TESTDIR/root/var && umount $TESTDIR/root/var
+ ddebug "umount $initdir/var"
+ mountpoint $initdir/var && umount $initdir/var
[[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt
}
check_result_qemu() {
local _ret=1
- mkdir -p $TESTDIR/root
- mount ${LOOPDEV}p1 $TESTDIR/root
- [[ -e $TESTDIR/root/testok ]] && _ret=0
- if [[ -s $TESTDIR/root/failed ]]; then
+ mkdir -p $initdir
+ mount ${LOOPDEV}p1 $initdir
+ [[ -e $initdir/testok ]] && _ret=0
+ if [[ -s $initdir/failed ]]; then
_ret=$(($_ret+1))
echo "=== Failed test log ==="
- cat $TESTDIR/root/failed
+ cat $initdir/failed
else
- if [[ -s $TESTDIR/root/skipped ]]; then
+ if [[ -s $initdir/skipped ]]; then
echo "=== Skipped test log =="
- cat $TESTDIR/root/skipped
+ cat $initdir/skipped
fi
- if [[ -s $TESTDIR/root/testok ]]; then
+ if [[ -s $initdir/testok ]]; then
echo "=== Passed tests ==="
- cat $TESTDIR/root/testok
+ cat $initdir/testok
fi
fi
- cp -a $TESTDIR/root/var/log/journal $TESTDIR
- umount $TESTDIR/root
+ cp -a $initdir/var/log/journal $TESTDIR
+ umount $initdir
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
return $_ret
}
create_empty_image_rootdir() {
create_empty_image
- mkdir -p $TESTDIR/root
- mount ${LOOPDEV}p1 $TESTDIR/root
+ mkdir -p $initdir
+ mount ${LOOPDEV}p1 $initdir
TEST_SETUP_CLEANUP_ROOTDIR=1
}
# can be overridden in specific test
check_result_qemu() {
local ret=1
- mkdir -p $TESTDIR/root
- mount ${LOOPDEV}p1 $TESTDIR/root
- [[ -e $TESTDIR/root/testok ]] && ret=0
- [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
- cp -a $TESTDIR/root/var/log/journal $TESTDIR
- check_asan_reports "$TESTDIR/root" || ret=$(($ret+1))
- umount $TESTDIR/root
+ mkdir -p $initdir
+ mount ${LOOPDEV}p1 $initdir
+ [[ -e $initdir/testok ]] && ret=0
+ [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
+ cp -a $initdir/var/log/journal $TESTDIR
+ check_asan_reports "$initdir" || ret=$(($ret+1))
+ umount $initdir
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1))
_test_setup_cleanup() {
# only umount if create_empty_image_rootdir() was called to mount it
- [[ -z $TEST_SETUP_CLEANUP_ROOTDIR ]] || _umount_dir $TESTDIR/root
+ [[ -z $TEST_SETUP_CLEANUP_ROOTDIR ]] || _umount_dir $initdir
}
# can be overridden in specific test
# (post-test) cleanup should always ignore failure and cleanup as much as possible
(
set +e
- _umount_dir $TESTDIR/root
+ _umount_dir $initdir
if [[ $LOOPDEV && -b $LOOPDEV ]]; then
ddebug "losetup -d $LOOPDEV"
losetup -d $LOOPDEV