mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-01 14:55:39 +00:00
travis: switch to the Ubuntu Xenial
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
language: c
|
||||
sudo: required
|
||||
dist: trusty
|
||||
dist: xenial
|
||||
cache: ccache
|
||||
services:
|
||||
- docker
|
||||
|
@@ -1,2 +1,2 @@
|
||||
FROM fedora:27
|
||||
FROM fedora:29
|
||||
ENV ASAN=1
|
||||
|
@@ -16,15 +16,23 @@ ZDTM_OPTIONS :=
|
||||
|
||||
alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
|
||||
|
||||
define DOCKER_JSON
|
||||
{
|
||||
"storage-driver": "devicemapper"
|
||||
}
|
||||
endef
|
||||
|
||||
export DOCKER_JSON
|
||||
$(TARGETS):
|
||||
echo 'DOCKER_OPTS="--storage-driver=devicemapper"' > /etc/default/docker
|
||||
restart docker
|
||||
echo "$$DOCKER_JSON" > /etc/docker/daemon.json
|
||||
systemctl restart docker
|
||||
$(MAKE) -C ../build $@$(target-suffix)
|
||||
docker run --env-file docker.env --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ scripts/travis/travis-tests
|
||||
|
||||
fedora-asan:
|
||||
echo 'DOCKER_OPTS="--storage-driver=devicemapper"' > /etc/default/docker
|
||||
restart docker
|
||||
ip6tables -L -n
|
||||
echo "$$DOCKER_JSON" > /etc/docker/daemon.json
|
||||
systemctl restart docker
|
||||
$(MAKE) -C ../build $@$(target-suffix)
|
||||
docker run --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)
|
||||
|
||||
|
@@ -1740,7 +1740,7 @@ class Launcher:
|
||||
|
||||
if sub['log']:
|
||||
with open(sub['log']) as sublog:
|
||||
print(sublog.read().encode('ascii', 'ignore'))
|
||||
print("%s" % sublog.read().encode('ascii', 'ignore').decode('utf-8'))
|
||||
os.unlink(sub['log'])
|
||||
|
||||
return True
|
||||
|
Reference in New Issue
Block a user