Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
02018f01
Commit
02018f01
authored
Nov 27, 2018
by
Andrei Vagin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
travis: switch to the Ubuntu Xenial
Signed-off-by:
Andrei Vagin
<
avagin@gmail.com
>
parent
bc522bcc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
7 deletions
+15
-7
.travis.yml
.travis.yml
+1
-1
Dockerfile.fedora-asan.hdr
scripts/build/Dockerfile.fedora-asan.hdr
+1
-1
Makefile
scripts/travis/Makefile
+12
-4
zdtm.py
test/zdtm.py
+1
-1
No files found.
.travis.yml
View file @
02018f01
language
:
c
language
:
c
sudo
:
required
sudo
:
required
dist
:
trusty
dist
:
xenial
cache
:
ccache
cache
:
ccache
services
:
services
:
-
docker
-
docker
...
...
scripts/build/Dockerfile.fedora-asan.hdr
View file @
02018f01
FROM fedora:2
7
FROM fedora:2
9
ENV ASAN=1
ENV ASAN=1
scripts/travis/Makefile
View file @
02018f01
...
@@ -16,15 +16,23 @@ ZDTM_OPTIONS :=
...
@@ -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
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)
:
$(TARGETS)
:
echo
'DOCKER_OPTS="--storage-driver=devicemapper"'
>
/etc/default/docker
echo
"
$$
DOCKER_JSON"
>
/etc/docker/daemon.json
restart docker
systemctl
restart docker
$(MAKE)
-C
../build
$@
$
(
target-suffix
)
$(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
docker run
--env-file
docker.env
--rm
-it
--privileged
-v
/lib/modules:/lib/modules
--tmpfs
/run criu-
$@
scripts/travis/travis-tests
fedora-asan
:
fedora-asan
:
echo
'DOCKER_OPTS="--storage-driver=devicemapper"'
>
/etc/default/docker
ip6tables
-L
-n
restart docker
echo
"
$$
DOCKER_JSON"
>
/etc/docker/daemon.json
systemctl restart docker
$(MAKE)
-C
../build
$@
$
(
target-suffix
)
$(MAKE)
-C
../build
$@
$
(
target-suffix
)
docker run
--rm
-it
--privileged
-v
/lib/modules:/lib/modules
--tmpfs
/run criu-
$@
./scripts/travis/asan.sh
$(ZDTM_OPTIONS)
docker run
--rm
-it
--privileged
-v
/lib/modules:/lib/modules
--tmpfs
/run criu-
$@
./scripts/travis/asan.sh
$(ZDTM_OPTIONS)
...
...
test/zdtm.py
View file @
02018f01
...
@@ -1740,7 +1740,7 @@ class Launcher:
...
@@ -1740,7 +1740,7 @@ class Launcher:
if
sub
[
'log'
]:
if
sub
[
'log'
]:
with
open
(
sub
[
'log'
])
as
sublog
:
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'
])
os
.
unlink
(
sub
[
'log'
])
return
True
return
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment