scripts: remove legacy build method test

[dpdk.git] / scripts / test-build.sh

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 6d28c5d..b23d6c8 100755 (executable)
--- a/scripts/test-build.sh
+++ b/scripts/test-build.sh
@@ -31,13 +31,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Load config options:
+# - AESNI_MULTI_BUFFER_LIB_PATH
 # - DPDK_BUILD_TEST_CONFIGS (target1+option1+option2 target2)
 # - DPDK_DEP_CFLAGS
 # - DPDK_DEP_LDFLAGS
 # - DPDK_DEP_MOFED (y/[n])
 # - DPDK_DEP_PCAP (y/[n])
 # - DPDK_NOTIFY (notify-send)
-. scripts/load-devel-config.sh
+. $(dirname $(readlink -e $0))/load-devel-config.sh
 
 print_usage () {
        echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
@@ -55,7 +56,7 @@ print_help () {
                -s    short test with only first config without examples/doc
 
        config: defconfig name followed by switches delimited with "+" sign
-               Example: x86_64-native-linuxapp-gcc+next+shared+combined
+               Example: x86_64-native-linuxapp-gcc+next+shared
                Default is to enable most of the options.
                The external dependencies are setup with DPDK_DEP_* variables.
        END_OF_HELP
@@ -95,14 +96,12 @@ cd $(dirname $(readlink -m $0))/..
 config () # <directory> <target> <options>
 {
        if [ ! -e $1/.config ] ; then
-               echo Custom configuration
+               echo "================== Configure $1"
                make T=$2 O=$1 config
                echo $3 | grep -q next || \
                sed -ri           's,(NEXT_ABI=)y,\1n,' $1/.config
                ! echo $3 | grep -q shared || \
                sed -ri         's,(SHARED_LIB=)n,\1y,' $1/.config
-               ! echo $3 | grep -q combined || \
-               sed -ri       's,(COMBINE_LIBS=)n,\1y,' $1/.config
                echo $2 | grep -q '^i686' || \
                sed -ri               's,(NUMA=)n,\1y,' $1/.config
                sed -ri         's,(PCI_CONFIG=)n,\1y,' $1/.config
@@ -110,7 +109,6 @@ config () # <directory> <target> <options>
                sed -ri             's,(BYPASS=)n,\1y,' $1/.config
                test "$DPDK_DEP_MOFED" != y || \
                echo $2 | grep -q '^clang$' || \
-               echo $3 | grep -q 'shared.*combined' || \
                sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_SZE" != y || \
                echo $2 | grep -q '^i686' || \
@@ -121,12 +119,12 @@ config () # <directory> <target> <options>
                test "$DPDK_DEP_PCAP" != y || \
                sed -ri               's,(PCAP=)n,\1y,' $1/.config
                test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
-               echo $2 | grep -q '^i686' || \
-               echo $3 | grep -q 'shared.*combined' || \
+               ! echo $2 | grep -q '^x86_64' || \
                sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
+               test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
+               ! echo $2 | grep -q '^x86_64' || \
+               sed -ri      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
                test "$DPDK_DEP_SSL" != y || \
-               echo $2 | grep -q '^i686' || \
-               echo $3 | grep -q 'shared.*combined' || \
                sed -ri            's,(PMD_QAT=)n,\1y,' $1/.config
                sed -ri        's,(KNI_VHOST.*=)n,\1y,' $1/.config
                sed -ri           's,(SCHED_.*=)n,\1y,' $1/.config
@@ -142,21 +140,23 @@ for conf in $configs ; do
        options=$(echo $conf | cut -d'+' -sf2- --output-delimiter='-')
        if [ -z "$options" ] ; then
                dir=$target
-               config $dir $target
-               # Use install rule
-               make -j$J T=$target install EXTRA_CFLAGS="$DPDK_DEP_CFLAGS" EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS"
-               $short || make -j$J T=$target examples O=$dir/examples EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS"
        else
                dir=$target-$options
-               config $dir $target $options
-               echo "================== Build $dir"
-               # Use O variable without install
-               make -j$J O=$dir EXTRA_CFLAGS="$DPDK_DEP_CFLAGS" EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS"
-               echo "================== Build examples for $dir"
-               make -j$J -sC examples RTE_SDK=$(pwd) RTE_TARGET=$dir O=$(readlink -m $dir/examples) EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS"
        fi
-       echo "################## $dir done."
+       config $dir $target $options
+
+       echo "================== Build $dir"
+       make -j$J EXTRA_CFLAGS="$DPDK_DEP_CFLAGS" \
+               EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" O=$dir
        ! $short || break
+       echo "================== Build examples for $dir"
+       export RTE_SDK=$(pwd)
+       export RTE_TARGET=$dir
+       make -j$J -sC examples \
+               EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" \
+               O=$(readlink -m $dir/examples)
+       unset RTE_TARGET
+       echo "################## $dir done."
 done
 
 if ! $short ; then