summaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2018-08-16 07:08:01 -0400
committerThomas Monjalon <thomas@monjalon.net>2018-08-21 11:03:10 +0200
commit7281cf520f890a5e779596c872e2440af7131eae (patch)
tree458727bf732f65a09c89c74757a7404871506b47 /devtools
parent76b9d9de5c7d747c381027156aac07735cb1bc0c (diff)
downloaddpdk-next-eventdev-7281cf520f890a5e779596c872e2440af7131eae.zip
dpdk-next-eventdev-7281cf520f890a5e779596c872e2440af7131eae.tar.gz
dpdk-next-eventdev-7281cf520f890a5e779596c872e2440af7131eae.tar.xz
devtools: relax rule for identifying symbol section
It was reported recently that some patches that add symbols to an existing EXPERIMENTAL section of a version map file generate errors because the check-symbol-change script was identifying the section as "@@" rather than EXPERIMENTAL. This was fairly clearly due to the fact that the rule identifying the version section expected the whole section to be added, rather than having it already exist, with only new symbols being added to the existing section. This led the match rule to misread the format of that line and pull the wrong word out of it. The fix is to relax the rule slightly. Rather than assume that the section must exist on a line that was added, allow the section name to be set by any line that ends in a '{', which should be correct, given our coding practices. The section name is then extracted as the next to the last word on the line ( $(NF-1) ). Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Cc: stable@dpdk.org Reported-by: Nikhil Rao <nikhil.rao@intel.com> Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Tested-by: Nikhil Rao <nikhil.rao@intel.com>
Diffstat (limited to 'devtools')
-rwxr-xr-xdevtools/check-symbol-change.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index daaf45e..cf9cfc7 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -25,14 +25,14 @@ build_map_changes()
# supresses the subordonate rules below
/[-+] a\/.*\.^(map)/ {in_map=0}
- # Triggering this rule, which starts a line with a + and ends it
+ # Triggering this rule, which starts a line and ends it
# with a { identifies a versioned section. The section name is
# the rest of the line with the + and { symbols remvoed.
# Triggering this rule sets in_sec to 1, which actives the
# symbol rule below
- /+.*{/ {gsub("+","");
+ /^.*{/ {
if (in_map == 1) {
- sec=$1; in_sec=1;
+ sec=$(NF-1); in_sec=1;
}
}