diff options
author | Andrei Vagin <avagin@virtuozzo.com> | 2018-03-02 00:49:12 +0300 |
---|---|---|
committer | Andrei Vagin <avagin@virtuozzo.com> | 2018-05-12 11:45:32 +0300 |
commit | 3e66125e9bf2e1150eecf7f68bbb1234ef561009 (patch) | |
tree | 5fea0c451fa574fad40ee4e7866e4af2727ddb42 /scripts/travis | |
parent | 8d91b2e3fceff2da4afccdeb1c43a0e5f61fdb32 (diff) |
[v2] criu: add -fprofile-update=atomic for builds with gcov
Sometimes we see errors like this:
criu/cr-restore.gcda:Merge mismatch for function 106
It proabably means that this gcda file was corrupted. According to the
gcc man page, the -fprofile-update=atomic should fix this problem.
v2: this options appered in gcc7, so we need to install it.
Reported-by: Mr Travis CI
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'scripts/travis')
-rwxr-xr-x | scripts/travis/travis-tests | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests index 7a2bd51d4..863a31057 100755 --- a/scripts/travis/travis-tests +++ b/scripts/travis/travis-tests @@ -20,6 +20,13 @@ travis_prep () { CC=clang fi + [ -n "$GCOV" ] && { + apt-add-repository -y "ppa:ubuntu-toolchain-r/test" + apt-get update -yq + apt-get -yq --no-install-suggests --no-install-recommends --force-yes install g++-7 + CC=gcc-7 + } + # ccache support, only enable for non-GCOV case if [ "$CCACHE" = "1" -a -z "$GCOV" ]; then # ccache is installed by default, need to set it up @@ -99,7 +106,7 @@ bash ./test/jenkins/criu-inhfd.sh make -C test/others/mnt-ext-dev/ run #make -C test/others/exec/ run -make -C test/others/make/ run +make -C test/others/make/ run CC="$CC" ./test/zdtm.py run -t zdtm/static/env00 --sibling |