From e6c1229b715fc2428972cec510635c177685f825 Mon Sep 17 00:00:00 2001
From: stefanrueger <stefan.rueger@urclocks.com>
Date: Mon, 5 Feb 2024 14:04:38 +1300
Subject: [PATCH] Remove config eesave output from test-avrdude -v runs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-v is meant to only show AVRDUDE errors and warnings

Before this commit:

$ tools/test-avrdude -v -p "-c dryrun -p m328p"
Testing avrdude version 7.2-20240201 (571a8063)
Prepare "-c dryrun -p m328p" and press 'enter' or 'space' to continue. Press any other key to skip
✅   0.064 s: fuse access: clear, set and read eesave fuse bit
config eesave=ee_erased # 1
✅   0.068 s: fuse access: set eesave fusebit to delete EEPROM on chip erase
✅   0.068 s: chip erase
✅   0.068 s: flash -U write/verify holes_rjmp_loops_32768B.hex
✅   0.068 s: flash -T write/verify holes_rjmp_loops_32768B.hex
✅   0.068 s: eeprom check whether programmer can flip 0s to 1s
✅   0.069 s: eeprom -U write/verify holes_pack_my_box_1024B.hex
✅   0.067 s: eeprom -T write/verify holes_{the_five_boxing_wizards,pack_my_box}_1024B.hex
✅   0.068 s: chip erase and spot check flash is actually erased
✅   0.068 s: spot check eeprom is erased, too

After:

$ tools/test-avrdude -v -p "-c dryrun -p m328p"
Testing avrdude version 7.2-20240201 (571a8063)
Prepare "-c dryrun -p m328p" and press 'enter' or 'space' to continue. Press any other key to skip
✅   0.065 s: fuse access: clear, set and read eesave fuse bit
✅   0.068 s: fuse access: set eesave fusebit to delete EEPROM on chip erase
✅   0.067 s: chip erase
✅   0.068 s: flash -U write/verify holes_rjmp_loops_32768B.hex
✅   0.068 s: flash -T write/verify holes_rjmp_loops_32768B.hex
✅   0.066 s: eeprom check whether programmer can flip 0s to 1s
✅   0.069 s: eeprom -U write/verify holes_pack_my_box_1024B.hex
✅   0.068 s: eeprom -T write/verify holes_{the_five_boxing_wizards,pack_my_box}_1024B.hex
✅   0.067 s: chip erase and spot check flash is actually erased
---
 tools/test-avrdude | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/test-avrdude b/tools/test-avrdude
index 85059976..d54bce71 100755
--- a/tools/test-avrdude
+++ b/tools/test-avrdude
@@ -321,16 +321,16 @@ for (( p=0; p<$arraylength; p++ )); do
       execute "${command[@]}" > $outfile
       fusebit=$(grep ^config $outfile | awk '{print $4}')
       sed -e/^config/d -e/"> "/d $outfile > ${outfile}-2
-      result [[ '"$fusebit"' == 1 '&&' ! -s ${outfile}-2 '&&' ! -s $logfile ]]
-      rm ${outfile}-2
+      mv ${outfile}-2 $outfile
+      result [[ '"$fusebit"' == 1 '&&' ! -s $outfile '&&' ! -s $logfile ]]
 
       if [ -n "$EE_SIZE" ]; then
         specify="fuse access: set eesave fusebit to delete EEPROM on chip erase"
         command=(${avrdude[@]} -T '"config eesave=ee*erased"')
         execute "${command[@]}" > $outfile
         sed -e/^config/d -e/"> "/d $outfile > ${outfile}-2
-        result [[ ! -s ${outfile}-2  '&&' ! -s $logfile ]]
-        rm ${outfile}-2
+        mv ${outfile}-2 $outfile
+        result [[ ! -s $outfile  '&&' ! -s $logfile ]]
       fi
     fi