From f08885494f241b115ad66763b585fbfb486d5160 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 23 Mar 2020 17:26:13 +0530 Subject: [PATCH] devtools: fix symbol map change check Fix check symbol change script to detect new diff file when it is in between "--- /dev/null" to "b/lib/...". Current awk line expects line to start with "a/..." which is not always true for all diffs. As a result if in_map was '1' earlier, it will not be changed to '0' and we get check patch errors which are not true. Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Cc: stable@dpdk.org Signed-off-by: David Marchand Signed-off-by: Nithin Dabilpuram Acked-by: Neil Horman Tested-by: Jerin Jacob --- devtools/check-symbol-change.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index c5434f3bb0..ed2178e36e 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -17,13 +17,11 @@ build_map_changes() # map files are altered, and all section/symbol names # appearing between a triggering of this rule and the # next trigger of this rule are associated with this file - /[-+] a\/.*\.map/ {map=$2; in_map=1} + /[-+] [ab]\/.*\.map/ {map=$2; in_map=1; next} - # Same pattern as above, only it matches on anything that - # does not end in 'map', indicating we have left the map chunk. - # When we hit this, turn off the in_map variable, which - # supresses the subordonate rules below - /[-+] a\/.*\.[^map]/ {in_map=0} + # The previous rule catches all .map files, anything else + # indicates we left the map chunk. + /[-+] [ab]\// {in_map=0} # Triggering this rule, which starts a line and ends it # with a { identifies a versioned section. The section name is -- 2.20.1