Commit d52720a4 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Andrei Vagin

travis-ci: Enable ia32 tests

Travis CI with Xenial has 4.15 kernel these days - all support for ia32
C/R should be inplace. Finally :)

Putting it into "allow_failures" to let it soak a bit.
Signed-off-by: 's avatarDmitry Safonov <dima@arista.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@gmail.com>
parent e7aba32e
......@@ -7,6 +7,8 @@ services:
env:
- TR_ARCH=local
- TR_ARCH=local CLANG=1
- TR_ARCH=local COMPAT_TEST=y
- TR_ARCH=local CLANG=1 COMPAT_TEST=y
- TR_ARCH=alpine
- TR_ARCH=fedora-asan
- TR_ARCH=x86_64
......@@ -29,7 +31,9 @@ matrix:
- env: TR_ARCH=fedora-rawhide
- env: TR_ARCH=fedora-rawhide-aarch64
- env: TR_ARCH=s390x
- env: TR_ARCH=local GCOV=1
- env: TR_ARCH=local GCOV=1
- env: TR_ARCH=local COMPAT_TEST=y
- env: TR_ARCH=local CLANG=1 COMPAT_TEST=y
script:
- sudo make CCACHE=1 -C scripts/travis $TR_ARCH
after_success:
......
......@@ -61,6 +61,30 @@ time make CC="$CC" -j4
[ -n "$SKIP_TRAVIS_TEST" ] && return
if [ "${COMPAT_TEST}x" = "yx" ] ; then
# Dirty hack to keep both ia32 & x86_64 shared libs on a machine:
# headers are probably not compatible, so apt-get doesn't allow
# installing both versions, while we need one for CRIU and one
# for 32-bit tests. A better way would involve launching docker..
# But it would require making zdtm.py aware of docker and launching
# tests inside the CT.
INCOMPATIBLE_LIBS="libaio-dev libcap-dev libnl-3-dev libnl-route-3-dev"
IA32_PKGS=""
REFUGE=64-refuge
mkdir "$REFUGE"
for i in $INCOMPATIBLE_LIBS ; do
for j in $(dpkg --listfiles $i | grep '\.so$') ; do
cp "$j" "$REFUGE/"
done
IA32_PKGS="$IA32_PKGS $i:i386"
done
apt-get remove $INCOMPATIBLE_LIBS
apt-get install --no-install-recommends $IA32_PKGS
mkdir -p /usr/lib/x86_64-linux-gnu/
mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
fi
time make CC="$CC" -j4 -C test/zdtm
[ -f "$CCACHE_LOGFILE" ] && cat $CCACHE_LOGFILE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment