diff options
author | Dmitry Safonov <dima@arista.com> | 2019-04-10 17:03:02 +0300 |
---|---|---|
committer | Andrei Vagin <avagin@gmail.com> | 2019-04-21 06:25:26 +0300 |
commit | d52720a49d5696b28cbfba8a06e1b95c1c94a464 (patch) | |
tree | 8e1f5db8e713f9e87ea44d696d68d67f45be34c9 /scripts/travis | |
parent | e7aba32efe388f5ba570c271b0113a30834f7f8f (diff) |
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: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Diffstat (limited to 'scripts/travis')
-rwxr-xr-x | scripts/travis/travis-tests | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests index 5a8884f07..01a2659f6 100755 --- a/scripts/travis/travis-tests +++ b/scripts/travis/travis-tests @@ -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 |