[commit] r1219 - trunk/util

[repository service]

Author: hailfinger
Date: Fri Oct 29 23:54:16 2010
New Revision: 1219
URL: http://flashrom.org/trac/flashrom/changeset/1219

Log:
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.

Signed-off-by: David Hendricks 
Acked-by: Carl-Daniel Hailfinger

Modified:
   trunk/util/flashrom_partial_write_test.sh

Modified: trunk/util/flashrom_partial_write_test.sh
==============================================================================
--- trunk/util/flashrom_partial_write_test.sh	Fri Oct 29 22:17:41 2010	(r1218)
+++ trunk/util/flashrom_partial_write_test.sh	Fri Oct 29 23:54:16 2010	(r1219)
@@ -81,13 +81,13 @@

echo "Reading BIOS image"
 BIOS="bios.bin"
-flashrom "$FLASHROM_PARAM" -r "$BIOS" > /dev/null
+flashrom ${FLASHROM_PARAM} -r "$BIOS" > /dev/null
 echo "Original image saved as ${BIOS}"

# $1: exit code
 do_exit() {
    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}"
    cd "$OLDDIR"
    exit "$1"
@@ -157,7 +157,7 @@
    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

-	./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
    	echo "partial flash failed on iteration ${i}"
    	echo "Result: FAIL"
@@ -166,7 +166,7 @@

# download the entire ROM image and use diff to compare to ensure
    # 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"
    if [ "$?" != "0" ] ; then
    	echo "diff test failed on iteration ${i}"
@@ -239,7 +239,7 @@
 " > layout_unaligned.txt

# reset the test file and ROM to the original state
-flashrom "$FLASHROM_PARAM" -w "$BIOS"
+flashrom ${FLASHROM_PARAM} -w "$BIOS"
 cp "$BIOS" "$TESTFILE"

i=0
@@ -256,7 +256,7 @@
    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

-	./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
    	echo "partial flash failed on iteration ${i}"
    	echo "Result: FAIL"
@@ -265,7 +265,7 @@

# download the entire ROM image and use diff to compare to ensure
    # 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"
    if [ "$?" != "0" ] ; then
    	echo "diff test failed on iteration ${i}"