[4/4] devtools: fix direct additions to stable API

Message ID 1556894060-13573-4-git-send-email-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [1/4] devtools: do not complain when reordering symbols |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

David Marchand May 3, 2019, 2:34 p.m. UTC
  The incriminated commit broke the detection of new symbols skipping the
EXPERIMENTAL step before entering a stable abi section.
sed won't return an error, check a null output instead.

Fixes: 3630757803ab ("devtools: accept experimental symbol promotion")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/check-symbol-change.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)
  

Comments

Thomas Monjalon May 9, 2019, 9:40 p.m. UTC | #1
03/05/2019 16:34, David Marchand:
> The incriminated commit broke the detection of new symbols skipping the
> EXPERIMENTAL step before entering a stable abi section.
> sed won't return an error, check a null output instead.
> 
> Fixes: 3630757803ab ("devtools: accept experimental symbol promotion")
> Cc: stable@dpdk.org
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>

Series applied (without patch 2), thanks
  

Patch

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 9ada81e..116c311 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -111,15 +111,24 @@  check_for_rule_violations()
 
 			# A symbol can not enter a non experimental
 			# section directly
-			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
+			if [ -z "$oldsecname" ]
 			then
-				echo -n "ERROR: symbol $symname "
-				echo -n "is added in the $secname "
-				echo -n "section, but is expected to "
-				echo -n "be added in the EXPERIMENTAL "
-				echo "section of the version map"
-				ret=1
-				continue
+				if [ "$secname" = 'EXPERIMENTAL' ]
+				then
+					echo -n "INFO: symbol $symname has "
+					echo -n "been added to the "
+					echo -n "EXPERIMENTAL section of the "
+					echo "version map"
+					continue
+				else
+					echo -n "ERROR: symbol $symname "
+					echo -n "is added in the $secname "
+					echo -n "section, but is expected to "
+					echo -n "be added in the EXPERIMENTAL "
+					echo "section of the version map"
+					ret=1
+					continue
+				fi
 			fi
 
 			# This symbol is moving inside a section, nothing to do