STRLCPY/criu

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 <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>

Dmitry Safonov committed with Andrei Vagin 5 years ago

d52720a4

1 parent e7aba32e

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

.travis.yml

		skipped 6 lines
7	7		env:
8	8		- TR_ARCH=local
9	9		- TR_ARCH=local CLANG=1
	10	+	- TR_ARCH=local COMPAT_TEST=y
	11	+	- TR_ARCH=local CLANG=1 COMPAT_TEST=y
10	12		- TR_ARCH=alpine
11	13		- TR_ARCH=fedora-asan
12	14		- TR_ARCH=x86_64
		skipped 16 lines
29	31		- env: TR_ARCH=fedora-rawhide
30	32		- env: TR_ARCH=fedora-rawhide-aarch64
31	33		- env: TR_ARCH=s390x
32		-	- env: TR_ARCH=local GCOV=1
	34	+	- env: TR_ARCH=local GCOV=1
	35	+	- env: TR_ARCH=local COMPAT_TEST=y
	36	+	- env: TR_ARCH=local CLANG=1 COMPAT_TEST=y
33	37		script:
34	38		- sudo make CCACHE=1 -C scripts/travis $TR_ARCH
35	39		after_success:
		skipped 4 lines

■ ■ ■ ■ ■ ■

scripts/travis/travis-tests

		skipped 60 lines
61	61
62	62		[ -n "$SKIP_TRAVIS_TEST" ] && return
63	63
	64	+	if [ "${COMPAT_TEST}x" = "yx" ] ; then
	65	+	# Dirty hack to keep both ia32 & x86_64 shared libs on a machine:
	66	+	# headers are probably not compatible, so apt-get doesn't allow
	67	+	# installing both versions, while we need one for CRIU and one
	68	+	# for 32-bit tests. A better way would involve launching docker..
	69	+	# But it would require making zdtm.py aware of docker and launching
	70	+	# tests inside the CT.
	71	+	INCOMPATIBLE_LIBS="libaio-dev libcap-dev libnl-3-dev libnl-route-3-dev"
	72	+	IA32_PKGS=""
	73	+	REFUGE=64-refuge
	74	+
	75	+	mkdir "$REFUGE"
	76	+	for i in $INCOMPATIBLE_LIBS ; do
	77	+	for j in $(dpkg --listfiles $i \| grep '\.so$') ; do
	78	+	cp "$j" "$REFUGE/"
	79	+	done
	80	+	IA32_PKGS="$IA32_PKGS $i:i386"
	81	+	done
	82	+	apt-get remove $INCOMPATIBLE_LIBS
	83	+	apt-get install --no-install-recommends $IA32_PKGS
	84	+	mkdir -p /usr/lib/x86_64-linux-gnu/
	85	+	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
	86	+	fi
	87	+
64	88		time make CC="$CC" -j4 -C test/zdtm
65	89
66	90		[ -f "$CCACHE_LOGFILE" ] && cat $CCACHE_LOGFILE
		skipped 84 lines