CIRCL
/
Circlean
mirror of https://github.com/CIRCL/Circlean
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix test runs so we get only this run's results.

pull/37/head
Eleanor Saitta 2015-12-16 15:45:32 -05:00
parent c666b09903
commit 6fcbc0a174
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/check_results.sh
View File

@ -16,7 +16,7 @@ if [ -z "$1" ]; then
echo "t_images1" echo "t_images1"
exit exit
fi fi
TEST_SOURCE_TYPE=${2} TEST_SOURCE_TYPE=${1}
set -e set -e
set -x set -x

13
tests/run.sh
View File

@ -65,6 +65,7 @@ umount ${SETUP_DIR}
# Prepare the test source key # Prepare the test source key
if [ ${TEST_PART_TYPE} = "VFAT_NORM" ]; then if [ ${TEST_PART_TYPE} = "VFAT_NORM" ]; then
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_VFAT_NORM} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_VFAT_NORM} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
@ -72,9 +73,11 @@ fi
# Prepare the test source key (with partitions) # Prepare the test source key (with partitions)
if [ ${TEST_PART_TYPE} = "VFAT_PART" ]; then if [ ${TEST_PART_TYPE} = "VFAT_PART" ]; then
mount -o loop,offset=${OFFSET_VFAT_PART1} ${IMAGE_VFAT_PART} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_PART1} ${IMAGE_VFAT_PART} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
mount -o loop,offset=${OFFSET_VFAT_PART2} ${IMAGE_VFAT_PART} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_PART2} ${IMAGE_VFAT_PART} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
@ -82,6 +85,7 @@ fi
# Prepare the test source key (NTFS) # Prepare the test source key (NTFS)
if [ ${TEST_PART_TYPE} = "NTFS_NORM" ]; then if [ ${TEST_PART_TYPE} = "NTFS_NORM" ]; then
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_NTFS_NORM} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_NTFS_NORM} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
@ -89,6 +93,7 @@ fi
# Prepare the test source key (EXT2) # Prepare the test source key (EXT2)
if [ ${TEST_PART_TYPE} = "EXT2" ]; then if [ ${TEST_PART_TYPE} = "EXT2" ]; then
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT2} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT2} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
@ -96,6 +101,7 @@ fi
# Prepare the test source key (EXT3) # Prepare the test source key (EXT3)
if [ ${TEST_PART_TYPE} = "EXT4" ]; then if [ ${TEST_PART_TYPE} = "EXT4" ]; then
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT3} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT3} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
@ -103,10 +109,17 @@ fi
# Prepare the test source key (EXT4) # Prepare the test source key (EXT4)
if [ ${TEST_PART_TYPE} = "EXT4" ]; then if [ ${TEST_PART_TYPE} = "EXT4" ]; then
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT4} ${SETUP_DIR} mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT4} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR} cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
umount ${SETUP_DIR} umount ${SETUP_DIR}
fi fi
# Prepare the test destination key
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_DEST} ${SETUP_DIR}
rm -rf ${SETUP_DIR}/*
umount ${SETUP_DIR}
# To make debugging easier # To make debugging easier
echo "KittenGroomer: about to enter tests/run.exp" 1>&2 echo "KittenGroomer: about to enter tests/run.exp" 1>&2