ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check_so_deps: Small refactor

Browse Source 
Move all operations on "integers" to proper arithmetic evaluation
constructs. This is to avoid the following seen in the build logs:

  check_so_deps.sh: line 353: [: : integer expression expected
  check_so_deps.sh: line 353: [: : integer expression expected

This can be seen whenever an object file is missing maj.min numbers
from its name.

Additionally, shuffle the code around to simplify parsing of the
abidiff output.

Change-Id: I8f4aef10f11382788533aa2d92e9ffdcd6a72e4b
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2743
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Michal Berger 2020-06-02 16:44:28 +02:00 committed by Tomasz Zawadzki
parent 44ab133f70
commit 8661ded761
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
test/make/check_so_deps.sh
View File

@ -287,59 +287,68 @@ EOF
continue continue
fi fi
if ! abidiff $source_abi_dir/$so_file $libdir/$so_file --leaf-changes-only --suppressions $suppression_file --stat > /dev/null; then if ! output=$(abidiff "$source_abi_dir/$so_file" "$libdir/$so_file" --leaf-changes-only --suppressions $suppression_file --stat); then
found_abi_change=false
output=$(abidiff $source_abi_dir/$so_file $libdir/$so_file --leaf-changes-only --suppressions $suppression_file --stat) || true
new_so_maj=$(readlink $libdir/$so_file | awk -F'\\.so\\.' '{print $2}' | cut -d '.' -f1)
new_so_min=$(readlink $libdir/$so_file | awk -F'\\.so\\.' '{print $2}' | cut -d '.' -f2)
old_so_maj=$(readlink $source_abi_dir/$so_file | awk -F'\\.so\\.' '{print $2}' | cut -d '.' -f1)
old_so_min=$(readlink $source_abi_dir/$so_file | awk -F'\\.so\\.' '{print $2}' | cut -d '.' -f2)
so_name_changed=$(grep "ELF SONAME changed" <<< "$output") || so_name_changed="No"
leaf_type_summary=$(grep "leaf types summary" <<< "$output") || true
function_summary=$(grep "functions summary" <<< "$output")
variable_summary=$(grep "variables summary" <<< "$output")
# remove any filtered out variables. # remove any filtered out variables.
leaf_type_summary=$(sed "s/ [()][^)]*[)]//g" <<< "$leaf_type_summary") output=${output// [()][^)]*[)]/}
function_summary=$(sed "s/ [()][^)]*[)]//g" <<< "$function_summary")
variable_summary=$(sed "s/ [()][^)]*[)]//g" <<< "$variable_summary")
read -r _ _ _ _ changed_leaf_types _ _ _ <<< "$leaf_type_summary" || changed_leaf_types=0 IFS="." read -r _ _ new_so_maj new_so_min < <(readlink "$libdir/$so_file")
read -r _ _ _ removed_functions _ changed_functions _ added_functions _ <<< "$function_summary" IFS="." read -r _ _ old_so_maj old_so_min < <(readlink "$source_abi_dir/$so_file")
read -r _ _ _ removed_vars _ changed_vars _ added_vars _ <<< "$variable_summary"
if [ $changed_leaf_types -ne 0 ]; then found_abi_change=false
if [ "$new_so_maj" == "$old_so_maj" ]; then so_name_changed=no
if [[ $output == *"ELF SONAME changed"* ]]; then
so_name_changed=yes
fi
changed_leaf_types=0
if [[ $output =~ "leaf types summary: "([0-9]+) ]]; then
changed_leaf_types=${BASH_REMATCH[1]}
fi
removed_functions=0 changed_functions=0 added_functions=0
if [[ $output =~ "functions summary: "([0-9]+)" Removed, "([0-9]+)" Changed, "([0-9]+)" Added" ]]; then
removed_functions=${BASH_REMATCH[1]} changed_functions=${BASH_REMATCH[2]} added_functions=${BASH_REMATCH[3]}
fi
removed_vars=0 changed_vars=0 added_vars=0
if [[ $output =~ "variables summary: "([0-9]+)" Removed, "([0-9]+)" Changed, "([0-9]+)" Added" ]]; then
removed_vars=${BASH_REMATCH[1]} changed_vars=${BASH_REMATCH[2]} added_vars=${BASH_REMATCH[3]}
fi
if ((changed_leaf_types != 0)); then
if ((new_so_maj == old_so_maj)); then
touch $fail_file touch $fail_file
echo "Please update the major SO version for $so_file. A header accesible type has been modified since last release." echo "Please update the major SO version for $so_file. A header accesible type has been modified since last release."
fi fi
found_abi_change=true found_abi_change=true
fi fi
if [ $removed_functions -ne 0 ] || [ $removed_vars -ne 0 ]; then if ((removed_functions != 0)) || ((removed_vars != 0)); then
if [ "$new_so_maj" == "$old_so_maj" ]; then if ((new_so_maj == old_so_maj)); then
touch $fail_file touch $fail_file
echo "Please update the major SO version for $so_file. API functions or variables have been removed since last release." echo "Please update the major SO version for $so_file. API functions or variables have been removed since last release."
fi fi
found_abi_change=true found_abi_change=true
fi fi
if [ $changed_functions -ne 0 ] || [ $changed_vars -ne 0 ]; then if ((changed_functions != 0)) || ((changed_vars != 0)); then
if [ "$new_so_maj" == "$old_so_maj" ]; then if ((new_so_maj == old_so_maj)); then
touch $fail_file touch $fail_file
echo "Please update the major SO version for $so_file. API functions or variables have been changed since last release." echo "Please update the major SO version for $so_file. API functions or variables have been changed since last release."
fi fi
found_abi_change=true found_abi_change=true
fi fi
if [ $added_functions -ne 0 ] || [ $added_vars -ne 0 ]; then if ((added_functions != 0)) || ((added_vars != 0)); then
if [ "$new_so_min" == "$old_so_min" ] && [ "$new_so_maj" == "$old_so_maj" ] && ! $found_abi_change; then if ((new_so_min == old_so_min && new_so_maj == old_so_maj)) && ! $found_abi_change; then
touch $fail_file touch $fail_file
echo "Please update the minor SO version for $so_file. API functions or variables have been added since last release." echo "Please update the minor SO version for $so_file. API functions or variables have been added since last release."
fi fi
found_abi_change=true found_abi_change=true
fi fi
if [ "$so_name_changed" != "No" ]; then if [[ $so_name_changed == yes ]]; then
if ! $found_abi_change; then if ! $found_abi_change; then
# Unfortunately, libspdk_idxd made it into 20.04 without an SO suffix. TODO:: remove after 20.07 # Unfortunately, libspdk_idxd made it into 20.04 without an SO suffix. TODO:: remove after 20.07
if [ "$so_file" != "libspdk_idxd.so" ] && [ "$so_file" != "libspdk_accel_idxd.so" ]; then if [ "$so_file" != "libspdk_idxd.so" ] && [ "$so_file" != "libspdk_accel_idxd.so" ]; then
@ -348,13 +357,13 @@ EOF
fi fi
fi fi
if [ "$new_so_maj" != "$old_so_maj" ] && [ "$new_so_min" != "0" ]; then if ((new_so_maj != old_so_maj && new_so_min != 0)); then
echo "SO major version for $so_file was bumped. Please reset the minor version to 0." echo "SO major version for $so_file was bumped. Please reset the minor version to 0."
touch $fail_file touch $fail_file
fi fi
expected_new_so_min=$((old_so_min + 1)) expected_new_so_min=$((old_so_min + 1))
if [ "$new_so_min" -gt "$old_so_min" ] && [ $expected_new_so_min != $new_so_min ]; then if ((new_so_min > old_so_min && expected_new_so_min != new_so_min)); then
echo "SO minor version for $so_file was incremented more than once. Please revert minor version to $expected_new_so_min." echo "SO minor version for $so_file was incremented more than once. Please revert minor version to $expected_new_so_min."
touch $fail_file touch $fail_file
fi fi