Fixing up tests

pull/37/head
Eleanor Saitta 2015-12-16 14:56:13 -05:00
parent a703d961f3
commit f2826aa573
2 changed files with 1 additions and 4 deletions

View File

@ -41,7 +41,7 @@ mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_DEST} ${RESULTS_DIR}
cp -rf ${RESULTS_DIR}/* actualResults cp -rf ${RESULTS_DIR}/* actualResults
umount ${RESULTS_DIR} umount ${RESULTS_DIR}
#TODO: Check if the results were what we expected.
# To make debugging easier # To make debugging easier
echo "KittenGroomer: done with tests/check_results.sh" 1>&2 echo "KittenGroomer: done with tests/check_results.sh" 1>&2

View File

@ -2,7 +2,6 @@
# http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/ # http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
<<<<<<< HEAD
# To make debugging easier # To make debugging easier
echo "KittenGroomer: in tests/run.sh" 1>&2 echo "KittenGroomer: in tests/run.sh" 1>&2
@ -19,8 +18,6 @@ fi
TEST_PART_TYPE=${1} TEST_PART_TYPE=${1}
TEST_SOURCE_TYPE=${2} TEST_SOURCE_TYPE=${2}
=======
>>>>>>> master
IMAGE='../raspbian-wheezy.img' IMAGE='../raspbian-wheezy.img'
OFFSET_ROOTFS=$((122880 * 512)) OFFSET_ROOTFS=$((122880 * 512))