Skip to content

Commit

Permalink
ci: rewrite coverage and distcheck scripts to follow other build scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
  • Loading branch information
Dmitry Eremin-Solenikov authored and muvarov committed Aug 29, 2018
1 parent 0ff72a3 commit b420bd3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 33 deletions.
27 changes: 9 additions & 18 deletions scripts/ci/coverage.sh
@@ -1,29 +1,23 @@
#!/bin/bash
set -e

# CC LD AR CXX has to be predifubed
#

export PKG_CONFIG_PATH="$HOME/cunit-install/x86_64/lib/pkgconfig:${PKG_CONFIG_PATH}"

CWD=$(dirname "$0")
TDIR=`mktemp -d -p ~`

cd ${TDIR}
echo 1000 | tee /proc/sys/vm/nr_hugepages
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge
if [ "${CC#clang}" != "${CC}" ] ; then
export CXX="clang++"
fi

git clone ${CWD}/../../ odp
cd ./odp
cd "$(dirname "$0")"/../..
./bootstrap
./configure \
CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \
--enable-debug=full --enable-helper-linux --enable-dpdk --disable-test-perf --disable-test-perf-proc
export CCACHE_DISABLE=1
make -j $(nproc)

# ignore possible failures there because these tests depends on measurements
echo 1000 | tee /proc/sys/vm/nr_hugepages
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge

# Ignore possible failures there because these tests depends on measurements
# and systems might differ in performance.
export CI="true"

Expand All @@ -50,7 +44,4 @@ fi

bash <(curl -s https://codecov.io/bash) -X coveragepy

cd ~
rm -rf ${TDIR}

umount /mnt/huge
22 changes: 7 additions & 15 deletions scripts/ci/distcheck.sh
@@ -1,25 +1,17 @@
#!/bin/bash
set -e

# CC LD AR CXX has to be predifubed
#
if [ "${CC#clang}" != "${CC}" ] ; then
export CXX="clang++"
fi

export PKG_CONFIG_PATH="$HOME/cunit-install/x86_64/lib/pkgconfig:${PKG_CONFIG_PATH}"

CWD=$(dirname "$0")
TDIR=`mktemp -d -p ~`

cd ${TDIR}
git clone ${CWD}/../../ odp
cd ./odp
cd "$(dirname "$0")"/../..
./bootstrap
./configure --enable-user-guides
./configure \
--enable-user-guides

make clean
make distcheck

make clean
make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat

cd ~
rm -rf ${TDIR}
make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat

0 comments on commit b420bd3

Please sign in to comment.