openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Replace "$FLASHROM_PARAM" with ${FLASHROM_PARAM} in util/flashrom_partial_write_test.sh

Browse Source 
Replace "$flashrom_PARAM" with ${FLASHROM_PARAM} in
util/flashrom_partial_write_test.sh to avoid passing in quoted
parameters which can cause problems especially if flashrom_PARAM is
empty or contains spaces.

Corresponding to flashrom svn r1219.

Signed-off-by: David Hendricks <dhendrix@google.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
David Hendricks 2010-10-29 21:54:16 +00:00 committed by Carl-Daniel Hailfinger
parent 444cefc65b
commit 04c8379e49
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/flashrom_partial_write_test.sh
View File

@ -81,13 +81,13 @@ echo "00h pattern written in ${ZERO_4K}"
echo "Reading BIOS image" echo "Reading BIOS image"
BIOS="bios.bin" BIOS="bios.bin"
flashrom "$FLASHROM_PARAM" -r "$BIOS" > /dev/null flashrom ${FLASHROM_PARAM} -r "$BIOS" > /dev/null
echo "Original image saved as ${BIOS}" echo "Original image saved as ${BIOS}"
# $1: exit code # $1: exit code
do_exit() { do_exit() {
echo "restoring original bios image using system's flashrom" echo "restoring original bios image using system's flashrom"
flashrom "$FLASHROM_PARAM" -w "$BIOS" flashrom ${FLASHROM_PARAM} -w "$BIOS"
echo "test files remain in ${TMPDIR}" echo "test files remain in ${TMPDIR}"
cd "$OLDDIR" cd "$OLDDIR"
exit "$1" exit "$1"
@ -157,7 +157,7 @@ while [ $i -lt $NUM_REGIONS ] ; do
dd if=${ZERO_4K} of=${TESTFILE} bs=1 conv=notrunc seek=${offset} 2> /dev/null dd if=${ZERO_4K} of=${TESTFILE} bs=1 conv=notrunc seek=${offset} 2> /dev/null
dd if=${FF_4K} of=${TESTFILE} bs=1 conv=notrunc seek=$((${offset} + 4096)) 2> /dev/null dd if=${FF_4K} of=${TESTFILE} bs=1 conv=notrunc seek=$((${offset} + 4096)) 2> /dev/null
./flashrom "$FLASHROM_PARAM" -l layout_4k_aligned.txt -i 00_${i} -i ff_${i} -w "$TESTFILE" > /dev/null ./flashrom ${FLASHROM_PARAM} -l layout_4k_aligned.txt -i 00_${i} -i ff_${i} -w "$TESTFILE" > /dev/null
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
echo "partial flash failed on iteration ${i}" echo "partial flash failed on iteration ${i}"
echo "Result: FAIL" echo "Result: FAIL"
@ -166,7 +166,7 @@ while [ $i -lt $NUM_REGIONS ] ; do
# download the entire ROM image and use diff to compare to ensure # download the entire ROM image and use diff to compare to ensure
# flashrom logic does not violate user-specified regions # flashrom logic does not violate user-specified regions
flashrom "$FLASHROM_PARAM" -r difftest.bin > /dev/null flashrom ${FLASHROM_PARAM} -r difftest.bin > /dev/null
diff -q difftest.bin "$TESTFILE" diff -q difftest.bin "$TESTFILE"
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
echo "diff test failed on iteration ${i}" echo "diff test failed on iteration ${i}"
@ -239,7 +239,7 @@ echo "
" > layout_unaligned.txt " > layout_unaligned.txt
# reset the test file and ROM to the original state # reset the test file and ROM to the original state
flashrom "$FLASHROM_PARAM" -w "$BIOS" flashrom ${FLASHROM_PARAM} -w "$BIOS"
cp "$BIOS" "$TESTFILE" cp "$BIOS" "$TESTFILE"
i=0 i=0
@ -256,7 +256,7 @@ while [ $i -lt $NUM_REGIONS ] ; do
dd if=${ZERO_4K} of=${TESTFILE} bs=1 conv=notrunc seek=${offset} 2> /dev/null dd if=${ZERO_4K} of=${TESTFILE} bs=1 conv=notrunc seek=${offset} 2> /dev/null
dd if=${FF_4K} of=${TESTFILE} bs=1 conv=notrunc seek=$((${offset} + 4096)) count=writelen 2> /dev/null dd if=${FF_4K} of=${TESTFILE} bs=1 conv=notrunc seek=$((${offset} + 4096)) count=writelen 2> /dev/null
./flashrom "$FLASHROM_PARAM" -l layout_unaligned.txt -i 00_${i} -i ff_${i} -w "$TESTFILE" > /dev/null ./flashrom ${FLASHROM_PARAM} -l layout_unaligned.txt -i 00_${i} -i ff_${i} -w "$TESTFILE" > /dev/null
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
echo "partial flash failed on iteration ${i}" echo "partial flash failed on iteration ${i}"
echo "Result: FAIL" echo "Result: FAIL"
@ -265,7 +265,7 @@ while [ $i -lt $NUM_REGIONS ] ; do
# download the entire ROM image and use diff to compare to ensure # download the entire ROM image and use diff to compare to ensure
# flashrom logic does not violate user-specified regions # flashrom logic does not violate user-specified regions
flashrom "$FLASHROM_PARAM" -r difftest.bin > /dev/null flashrom ${FLASHROM_PARAM} -r difftest.bin > /dev/null
diff -q difftest.bin "$TESTFILE" diff -q difftest.bin "$TESTFILE"
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
echo "diff test failed on iteration ${i}" echo "diff test failed on iteration ${i}"