Merge branch 'master' of https://github.com/OpenDataPlane/odp into odp-dpdk

Signed-off-by: Matias Elo <matias.elo@nokia.com>

4 files changed, 10 insertions, 52 deletions

diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index ce132faeb..2f333bccb 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -14,42 +14,10 @@ make -j $(nproc)
 
 make install
 
-pushd ${HOME}
-
-# Fix build on CentOS
-PKG_CONFIG="${TARGET_ARCH}-pkg-config"
-if ! [ -x "$(command -v ${PKG_CONFIG})" ]; then
-        PKG_CONFIG="pkg-config"
-fi
-
-# Default ODP library name
-if [ -z "$ODP_LIB_NAME" ] ; then
-ODP_LIB_NAME=libodp-dpdk
-fi
-
-# Additional warning checks
-EXTRA_CHECKS="-Werror -Wall -Wextra -Wfloat-equal -Wpacked"
-# Ignore clang warning about large atomic operations causing significant performance penalty
-if [ "${CC#clang}" != "${CC}" ] ; then
-	EXTRA_CHECKS="${EXTRA_CHECKS} -Wno-unknown-warning-option -Wno-atomic-alignment"
-fi
-# Ignore warnings from aarch64 DPDK internals
-if [ "${TARGET_ARCH}" == "aarch64-linux-gnu" ] ; then
-	EXTRA_CHECKS="${EXTRA_CHECKS} -Wno-packed"
-fi
-
-${CC} ${CFLAGS} ${EXTRA_CHECKS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -o odp_sysinfo_inst_dynamic \
-	`PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} ${PKG_CONFIG} --cflags --libs ${ODP_LIB_NAME}`
-
-sysctl vm.nr_hugepages=1000
+echo 1000 | tee /proc/sys/vm/nr_hugepages
 mkdir -p /mnt/huge
 mount -t hugetlbfs nodev /mnt/huge
 
-if [ -z "$TARGET_ARCH" ] || [ "$TARGET_ARCH" == "$BUILD_ARCH" ]
-then
-	LD_LIBRARY_PATH="/opt/odp/lib:$LD_LIBRARY_PATH" ./odp_sysinfo_inst_dynamic
-fi
-popd
+make installcheck
 
-#dpdk wrapper script can umount hugepages itself
-umount /mnt/huge || true
+umount /mnt/huge
diff --git a/scripts/ci/build_ppc64el.sh b/scripts/ci/build_ppc64el.sh
index 984481bb5..93dd36290 100755
--- a/scripts/ci/build_ppc64el.sh
+++ b/scripts/ci/build_ppc64el.sh
@@ -7,6 +7,10 @@ if [ "${CC#clang}" != "${CC}" ] ; then
 	export CXX="clang++ --target=${TARGET_ARCH}"
 	# DPDK clang build broken
 	export CONF="${CONF} --disable-dpdk"
+
+	# Ignore warnings about large atomic operation performance penalty
+	export ODP_CFLAGS_EXTRA=-Wno-error=atomic-alignment
+
 else
 	export CC="${TARGET_ARCH}-gcc"
 	export CXX="${TARGET_ARCH}-g++"
diff --git a/scripts/ci/build_riscv64.sh b/scripts/ci/build_riscv64.sh
index bf6fdf941..c395aac82 100755
--- a/scripts/ci/build_riscv64.sh
+++ b/scripts/ci/build_riscv64.sh
@@ -27,6 +27,4 @@ make -j $(nproc)
 
 make install
 
-pushd ${HOME}
-${CC} ${CFLAGS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -o odp_sysinfo_inst_dynamic `PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux`
-popd
+make installcheck
diff --git a/scripts/ci/build_static_x86_64.sh b/scripts/ci/build_static_x86_64.sh
index f32873afc..50a056396 100755
--- a/scripts/ci/build_static_x86_64.sh
+++ b/scripts/ci/build_static_x86_64.sh
@@ -14,22 +14,10 @@ make -j $(nproc)
 
 make install
 
-# Build and run sysinfo with installed libs
-pushd ${HOME}
-
-# Default ODP library name
-if [ -z "$ODP_LIB_NAME" ] ; then
-ODP_LIB_NAME=libodp-dpdk
-fi
-
-${CC} ${CFLAGS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -static -o odp_sysinfo_inst_static `PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs --static ${ODP_LIB_NAME}`
-
-echo 1500 | tee /proc/sys/vm/nr_hugepages
+echo 1000 | tee /proc/sys/vm/nr_hugepages
 mkdir -p /mnt/huge
 mount -t hugetlbfs nodev /mnt/huge
 
-./odp_sysinfo_inst_static
+make installcheck
 
 umount /mnt/huge
-
-popd