Commit dbc4eb64 authored by Nelson Bighetti's avatar Nelson Bighetti Committed by Tomasz Zawadzki
Browse files

scripts/check_format.sh: macOS patch doesn't support --merge option 



Fixes #3739. Replace patch with GNU patch on macOS when using --merge option.


Change-Id: I5d21d9c6efad41af5de674ad8979c7a1ceee7c83
Signed-off-by: default avatarNelson Bighetti <bachmanity138@gmail.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26647


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent 640b5b01

scripts/check_format.sh

+8 −1
Original line number Diff line number Diff line
@@ -25,11 +25,18 @@ if [[ $(uname -s) == Darwin ]]; then 
		echo "Please install GNU grep"

		exit 1

	fi

	if ! hash gpatch 2> /dev/null; then

		# We need GNU patch for --merge option

		echo "Please install GNU patch"

		exit 1

	fi

	GNU_READLINK="greadlink"

	GNU_GREP="ggrep"

	GNU_PATCH="gpatch"

else

	GNU_READLINK="readlink"

	GNU_GREP="grep"

	GNU_PATCH="patch"

fi



rootdir=$($GNU_READLINK -f "$(dirname "$0")")/..
@@ -566,7 +573,7 @@ function check_bash_style() { 
				# its stderr, hence the diff file should remain empty.

				rc=1

				if [[ -s $diff ]]; then

					if patch --merge -p0 < "$diff"; then

					if $GNU_PATCH --merge -p0 < "$diff"; then

						diff_out=$(git diff)



						if [[ -n $diff_out ]]; then