diff options
| author | Matias Elo <matias.elo@nokia.com> | 2019-05-15 10:35:37 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2019-05-15 10:35:37 +0300 |
| commit | ebe70ec11dcc32ae62deaf53ff972e5ad26a792d (patch) | |
| tree | 6033da413c26561861dbbe18483de29a4af594eb /scripts/ci | |
| parent | a7e8e58948345a882228d2c20a03130b670b86ce (diff) | |
| parent | 7f79421ba6204559fc33d960f9c58ee4bd2ca064 (diff) | |
Merge branch 'master' of https://github.com/OpenDataPlane/odp into odp-dpdk
# Conflicts:
# .travis.yml
# configure.ac
# scripts/ci/check.sh
# scripts/ci/coverage.sh
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/check.sh | 9 | ||||
| -rwxr-xr-x | scripts/ci/coverage.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/out_of_tree.sh | 13 |
3 files changed, 18 insertions, 6 deletions
diff --git a/scripts/ci/check.sh b/scripts/ci/check.sh index 30780254f..a181a184b 100755 --- a/scripts/ci/check.sh +++ b/scripts/ci/check.sh @@ -1,6 +1,10 @@ #!/bin/bash set -e +echo 1500 | tee /proc/sys/vm/nr_hugepages +mkdir -p /mnt/huge +mount -t hugetlbfs nodev /mnt/huge + "`dirname "$0"`"/build_x86_64.sh cd "$(dirname "$0")"/../.. @@ -8,11 +12,6 @@ cd "$(dirname "$0")"/../.. # Ignore possible failures there because these tests depends on measurements # and systems might differ in performance. export CI="true" - -sysctl vm.nr_hugepages=1000 -mkdir -p /mnt/huge -mount -t hugetlbfs nodev /mnt/huge - make check #dpdk wrapper script can umount hugepages itself diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index 7a08ae774..deb92b7b4 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -9,7 +9,7 @@ cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ - --enable-debug=full --enable-helper-linux --disable-test-perf --disable-test-perf-proc + --enable-debug=full --enable-helper-linux --disable-test-perf export CCACHE_DISABLE=1 make -j $(nproc) diff --git a/scripts/ci/out_of_tree.sh b/scripts/ci/out_of_tree.sh new file mode 100755 index 000000000..d39f55438 --- /dev/null +++ b/scripts/ci/out_of_tree.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +if [ "${CC#clang}" != "${CC}" ] ; then + export CXX="clang++" +fi + +cd "$(dirname "$0")"/../.. +./bootstrap +mkdir tmp && cd tmp +../configure ${CONF} +make -j $(nproc) + |