Skip to content

Commit

Permalink
test-avrdude: Adapt version check to new version format
Browse files Browse the repository at this point in the history
The output of the version information in "avrdude -v" has changed between
avrdude 7.3 and now (commit cf0822b):

avrdude: Version 7.3

Avrdude version 7.3-20240814 (250a663a)

This means that the old grep call looking for "Version" cannot
find anything any more, and therefore needs to be changed.

This was not discovered as the test-avrdude script neglected to
abort if no version information is found.
  • Loading branch information
ndim committed Aug 15, 2024
1 parent e230d88 commit 29133dc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/test-avrdude
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fi
arraylength=${#pgm_and_target[@]}
type "$avrdude_bin" >/dev/null 2>&1 || { echo "$progname: cannot execute $avrdude_bin"; exit 1; }
echo -n "Testing $avrdude_bin"
$avrdude_bin -v 2>&1 | grep Version | cut -f2- -d: | sed s/Version/version/
$avrdude_bin -v 2>&1 | grep '[vV]ersion' | cut -f2- -d: | sed s/Version/version/

[[ -d $tmp && -w $tmp ]] || tmp=/tmp # Fall back to /tmp if tmp directory unusable
status=$(mktemp "$tmp/$progname.status.XXXXXX")
Expand Down

0 comments on commit 29133dc

Please sign in to comment.