mirror of https://github.com/CIRCL/Circlean
Rework the way we select which partition types to test and introduce the concept of file test sets. Remove redundant old-style partition data sources.
parent
6b6d7df247
commit
c4879f99b6
13
run_tests.sh
13
run_tests.sh
|
@ -1,11 +1,22 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
TEST_PART_TYPE=${1}
|
||||||
|
TEST_SOURCE_TYPE=${2}
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
TEST_PART_TYPE="VFAT_NORM"
|
||||||
|
fi
|
||||||
|
if [ -z "$2" ]; then
|
||||||
|
TEST_SOURCE_TYPE="t_images1"
|
||||||
|
fi
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
./mount_image.sh ./copy_to_final.sh
|
./mount_image.sh ./copy_to_final.sh
|
||||||
|
|
||||||
pushd tests/
|
pushd tests/
|
||||||
|
|
||||||
./run.sh
|
./run.sh ${TEST_PART_TYPE} ${TEST_SOURCE_TYPE}
|
||||||
|
./check_results.sh ${TEST_SOURCE_TYPE}
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# To make debugging easier
|
||||||
|
echo "KittenGroomer: in tests/check_results.sh" 1>&2
|
||||||
|
|
||||||
|
OFFSET_VFAT_NORM=$((8192 * 512))
|
||||||
|
IMAGE_DEST="testcase_dest.vfat"
|
||||||
|
|
||||||
|
if [ "$(id -u)" != "0" ]; then
|
||||||
|
echo "This script must be run as root" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
echo "Please tell me which file type to test."
|
||||||
|
echo "t_images1"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
TEST_SOURCE_TYPE=${2}
|
||||||
|
|
||||||
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
|
RESULTS_DIR="results"
|
||||||
|
|
||||||
|
# To make debugging easier
|
||||||
|
echo "Removing results from previous run." 1>&2
|
||||||
|
rm -rf actualResults/*
|
||||||
|
|
||||||
|
clean(){
|
||||||
|
umount ${RESULTS_DIR}
|
||||||
|
rm -rf ${RESULTS_DIR}
|
||||||
|
}
|
||||||
|
|
||||||
|
trap clean EXIT TERM INT
|
||||||
|
|
||||||
|
mkdir -p ${RESULTS_DIR}
|
||||||
|
|
||||||
|
# Get the run results
|
||||||
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_DEST} ${RESULTS_DIR}
|
||||||
|
cp -rf ${RESULTS_DIR}/* actualResults
|
||||||
|
umount ${RESULTS_DIR}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# To make debugging easier
|
||||||
|
echo "KittenGroomer: done with tests/check_results.sh" 1>&2
|
114
tests/run.sh
114
tests/run.sh
|
@ -5,6 +5,18 @@
|
||||||
# To make debugging easier
|
# To make debugging easier
|
||||||
echo "KittenGroomer: in tests/run.sh" 1>&2
|
echo "KittenGroomer: in tests/run.sh" 1>&2
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
echo "Please tell me which partition type to test."
|
||||||
|
echo "VFAT_NORM VFAT_PART NTPS_NORM EXT2 EXT3 EXT4"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
if [ -z "$2" ]; then
|
||||||
|
echo "Please tell me which file type to test."
|
||||||
|
echo "t_images1"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
TEST_PART_TYPE=${1}
|
||||||
|
TEST_SOURCE_TYPE=${2}
|
||||||
|
|
||||||
IMAGE='../raspbian-wheezy.img'
|
IMAGE='../raspbian-wheezy.img'
|
||||||
OFFSET_ROOTFS=$((122880 * 512))
|
OFFSET_ROOTFS=$((122880 * 512))
|
||||||
|
@ -48,54 +60,88 @@ mount -o loop,offset=${OFFSET_ROOTFS} ${IMAGE} ${SETUP_DIR}
|
||||||
mv ${SETUP_DIR}/etc/ld.so.preload ${SETUP_DIR}/etc/ld.so.preload_bkp
|
mv ${SETUP_DIR}/etc/ld.so.preload ${SETUP_DIR}/etc/ld.so.preload_bkp
|
||||||
umount ${SETUP_DIR}
|
umount ${SETUP_DIR}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Prepare the test source key
|
# Prepare the test source key
|
||||||
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_VFAT_NORM} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "VFAT_NORM" ]; then
|
||||||
cp -rf content_img_vfat_norm/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_VFAT_NORM} ${SETUP_DIR}
|
||||||
umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepare the test source key (with partitions)
|
# Prepare the test source key (with partitions)
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_PART1} ${IMAGE_VFAT_PART} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "VFAT_PART" ]; then
|
||||||
#cp -rf content_img_vfat_part1/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_PART1} ${IMAGE_VFAT_PART} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_PART2} ${IMAGE_VFAT_PART} ${SETUP_DIR}
|
umount ${SETUP_DIR}
|
||||||
#cp -rf content_img_vfat_part2/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_PART2} ${IMAGE_VFAT_PART} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepare the test source key (NTFS)
|
# Prepare the test source key (NTFS)
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_NTFS_NORM} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "NTFS_NORM" ]; then
|
||||||
#cp -rf content_img_vfat_norm/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_NTFS_NORM} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepare the test source key (EXT2)
|
# Prepare the test source key (EXT2)
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT2} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "EXT2" ]; then
|
||||||
#cp -rf content_img_vfat_norm/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT2} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepare the test source key (EXT3)
|
# Prepare the test source key (EXT3)
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT3} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "EXT4" ]; then
|
||||||
#cp -rf content_img_vfat_norm/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT3} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepare the test source key (EXT4)
|
# Prepare the test source key (EXT4)
|
||||||
#mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT4} ${SETUP_DIR}
|
if [ ${TEST_PART_TYPE} = "EXT4" ]; then
|
||||||
#cp -rf content_img_vfat_norm/* ${SETUP_DIR}
|
mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_EXT4} ${SETUP_DIR}
|
||||||
#umount ${SETUP_DIR}
|
cp -rf testFiles/${TEST_SOURCE_TYPE}/* ${SETUP_DIR}
|
||||||
|
umount ${SETUP_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
chmod a-w ${IMAGE}
|
chmod a-w ${IMAGE}
|
||||||
./run.exp ${IMAGE} ${IMAGE_VFAT_NORM} ${IMAGE_DEST}
|
|
||||||
#sleep 10
|
|
||||||
#./run.exp ${IMAGE} ${IMAGE_VFAT_PART} ${IMAGE_DEST}
|
if [ ${TEST_PART_TYPE} = "VFAT_NORM" ]; then
|
||||||
#sleep 10
|
./run.exp ${IMAGE} ${IMAGE_VFAT_NORM} ${IMAGE_DEST}
|
||||||
#./run.exp ${IMAGE} ${IMAGE_NTFS_NORM} ${IMAGE_DEST}
|
sleep 10
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${TEST_PART_TYPE} = "VFAT_PART" ]; then
|
||||||
|
./run.exp ${IMAGE} ${IMAGE_VFAT_PART} ${IMAGE_DEST}
|
||||||
|
sleep 10
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${TEST_PART_TYPE} = "NTFS_NORM" ]; then
|
||||||
|
./run.exp ${IMAGE} ${IMAGE_NTFS_NORM} ${IMAGE_DEST}
|
||||||
|
sleep 10
|
||||||
|
fi
|
||||||
|
|
||||||
# EXT* not supported due to permission issues
|
# EXT* not supported due to permission issues
|
||||||
#sleep 10
|
if [ ${TEST_PART_TYPE} = "EXT2" ]; then
|
||||||
#./run.exp ${IMAGE} ${IMAGE_EXT2} ${IMAGE_DEST}
|
./run.exp ${IMAGE} ${IMAGE_EXT2} ${IMAGE_DEST}
|
||||||
#sleep 10
|
sleep 10
|
||||||
#./run.exp ${IMAGE} ${IMAGE_EXT3} ${IMAGE_DEST}
|
fi
|
||||||
#sleep 10
|
if [ ${TEST_PART_TYPE} = "EXT3" ]; then
|
||||||
#./run.exp ${IMAGE} ${IMAGE_EXT4} ${IMAGE_DEST}
|
./run.exp ${IMAGE} ${IMAGE_EXT3} ${IMAGE_DEST}
|
||||||
|
sleep 10
|
||||||
|
fi
|
||||||
|
if [ ${TEST_PART_TYPE} = "NTFS_EXT4" ]; then
|
||||||
|
./run.exp ${IMAGE} ${IMAGE_EXT4} ${IMAGE_DEST}
|
||||||
|
sleep 10
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
#./run.exp ${IMAGE} ${IMAGE_VFAT_PART} ${IMAGE_DEST}
|
|
||||||
chmod +w ${IMAGE}
|
chmod +w ${IMAGE}
|
||||||
|
|
||||||
# To make debugging easier
|
# To make debugging easier
|
||||||
|
|
Loading…
Reference in New Issue