diff options
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/check-symbol-change.sh | 44 | ||||
| -rwxr-xr-x | devtools/checkpatches.sh | 2 | ||||
| -rwxr-xr-x | devtools/test-build.sh | 12 | ||||
| -rwxr-xr-x | devtools/test-meson-builds.sh | 10 |
4 files changed, 50 insertions, 18 deletions
diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index 8f986a5d..f6f79a88 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -97,7 +97,7 @@ check_for_rule_violations() then # Just inform the user of this occurrence, but # don't flag it as an error - echo -n "INFO: symbol $syname is added but " + echo -n "INFO: symbol $symname is added but " echo -n "patch has insuficient context " echo -n "to determine the section name " echo -n "please ensure the version is " @@ -105,26 +105,46 @@ check_for_rule_violations() continue fi - if [ "$secname" != "EXPERIMENTAL" ] + oldsecname=$(sed -n \ + "s#$mname $symname \(.*\) del#\1#p" "$mapdb") + + # A symbol can not enter a non experimental + # section directly + if [ -z "$oldsecname" ] then - # Symbols that are getting added in a section - # other than the experimental section - # to be moving from an already supported - # section or its a violation - grep -q \ - "$mname $symname [^EXPERIMENTAL] del" "$mapdb" - if [ $? -ne 0 ] + 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 a section " - echo -n "other than the EXPERIMENTAL " + 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 between two sections (the + # original section is not experimental). + # This can be legit, just warn. + if [ "$oldsecname" != 'EXPERIMENTAL' ] + then + echo -n "INFO: symbol $symname is being " + echo -n "moved from $oldsecname to $secname. " + echo -n "Ensure that it has gone through the " + echo "deprecation process" + continue + fi else - if [ "$secname" != "EXPERIMENTAL" ] + if ! grep -q "$mname $symname .* add" "$mapdb" && \ + [ "$secname" != "EXPERIMENTAL" ] then # Just inform users that non-experimenal # symbols need to go through a deprecation diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index 3b03b7ef..02d1c303 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -62,7 +62,7 @@ check_forbidden_additions() { # <patch> -v RET_ON_FAIL=1 \ -v MESSAGE='Using explicit .svg extension instead of .*' \ -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \ - "$1" || res = 1 + "$1" || res=1 return $res } diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 42f4ad00..d37b121c 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -9,6 +9,7 @@ default_path=$PATH # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) # - DPDK_DEP_ARCHIVE # - DPDK_DEP_CFLAGS +# - DPDK_DEP_ELF (y/[n]) # - DPDK_DEP_ISAL (y/[n]) # - DPDK_DEP_JSON (y/[n]) # - DPDK_DEP_LDFLAGS @@ -96,6 +97,7 @@ reset_env () unset CROSS unset DPDK_DEP_ARCHIVE unset DPDK_DEP_CFLAGS + unset DPDK_DEP_ELF unset DPDK_DEP_ISAL unset DPDK_DEP_JSON unset DPDK_DEP_LDFLAGS @@ -148,7 +150,7 @@ config () # <directory> <target> <options> test "$DPDK_DEP_ARCHIVE" != y || \ sed -ri 's,(RESOURCE_TAR=)n,\1y,' $1/.config test "$DPDK_DEP_ISAL" != y || \ - sed -ri 's,(ISAL_PMD=)n,\1y,' $1/.config + sed -ri 's,(PMD_ISAL=)n,\1y,' $1/.config test "$DPDK_DEP_MLX" != y || \ sed -ri 's,(MLX._PMD=)n,\1y,' $1/.config test "$DPDK_DEP_SZE" != y || \ @@ -156,6 +158,8 @@ config () # <directory> <target> <options> test "$DPDK_DEP_ZLIB" != y || \ sed -ri 's,(BNX2X_PMD=)n,\1y,' $1/.config test "$DPDK_DEP_ZLIB" != y || \ + sed -ri 's,(PMD_ZLIB=)n,\1y,' $1/.config + test "$DPDK_DEP_ZLIB" != y || \ sed -ri 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config test "$DPDK_DEP_PCAP" != y || \ sed -ri 's,(PCAP=)n,\1y,' $1/.config @@ -176,7 +180,7 @@ config () # <directory> <target> <options> test "$DPDK_DEP_SSL" != y || \ sed -ri 's,(PMD_OPENSSL=)n,\1y,' $1/.config test "$DPDK_DEP_SSL" != y || \ - sed -ri 's,(PMD_QAT=)n,\1y,' $1/.config + sed -ri 's,(QAT_SYM=)n,\1y,' $1/.config test -z "$FLEXRAN_SDK" || \ sed -ri 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config sed -ri 's,(SCHED_.*=)n,\1y,' $1/.config @@ -186,7 +190,9 @@ config () # <directory> <target> <options> sed -ri 's,(MVPP2_PMD=)n,\1y,' $1/.config test -z "$LIBMUSDK_PATH" || \ sed -ri 's,(MVNETA_PMD=)n,\1y,' $1/.config - test -z "$DPDK_DEP_JSON" || \ + test "$DPDK_DEP_ELF" != y || \ + sed -ri 's,(BPF_ELF=)n,\1y,' $1/.config + test "$DPDK_DEP_JSON" != y || \ sed -ri 's,(TELEMETRY=)n,\1y,' $1/.config build_config_hook $1 $2 $3 diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 3edc805f..79148ba2 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -7,7 +7,7 @@ # * if a build-directory already exists we assume it was properly configured # Run ninja after configuration is done. -srcdir=$(dirname $(readlink -m $0))/.. +srcdir=$(dirname $(readlink -f $0))/.. MESON=${MESON:-meson} use_shared="--default-library=shared" @@ -36,6 +36,7 @@ build () # <directory> <meson options> # shared and static linked builds with gcc and clang for c in gcc clang ; do + command -v $c >/dev/null 2>&1 || continue for s in static shared ; do export CC="ccache $c" build build-$c-$s --default-library=$s @@ -43,7 +44,12 @@ for c in gcc clang ; do done # test compilation with minimal x86 instruction set -build build-x86-default -Dmachine=nehalem $use_shared +default_machine='nehalem' +ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) +if [ "$ok" = "false" ] ; then + default_machine='corei7' +fi +build build-x86-default -Dmachine=$default_machine $use_shared # enable cross compilation if gcc cross-compiler is found c=aarch64-linux-gnu-gcc |