More changes to be compatible with python 3

Submitted by Andrey Vagin on May 30, 2018, 6:39 p.m.

Details

Reviewer None
Submitted May 30, 2018, 6:39 p.m.
Last Updated June 2, 2018, 8:29 a.m.
Revision 2

Cover Letter

Andrei Vagin (14):
  test: make zdtm.py python2/python3 compatible
  [v2] travis: set python3 as default for fedora containers
  test: import pycriu by its right name
  [v2] lib: a few fixes to be compatible with python3
  test: make crit-recode.py python2/python3 compatible
  travis: run the crit-recode test
  alpine: call write instead of fprintf
  criu: musl scanf and printf don't support the L modifer for intergers
  alpine: sigaltstack returns EINVAL if SS_ONSTACK is set
  build/docker: install packages to run tests
  test: don't save content of /sys/kernel/debug/tracing/trace
  zdtm: fix collecting libraries on Alpine Linux
  test/netns-nf: add one more path for libxt_standard.so
  test: run a full set of tests in docker containers

 criu/fsnotify.c                      |   2 +-
 criu/proc_parse.c                    |   2 +-
 criu/signalfd.c                      |   2 +-
 criu/uffd.c                          |   2 +-
 lib/py/criu.py                       |   2 +
 lib/py/images/images.py              |  41 ++---
 lib/py/images/pb2dict.py             |  24 ++-
 scripts/build/Dockerfile.alpine      |   6 +-
 scripts/build/Dockerfile.centos      |   7 +-
 scripts/build/Dockerfile.fedora.tmpl |  11 +-
 scripts/travis/Makefile              |   8 +-
 scripts/travis/docker.env            |   4 +
 scripts/travis/travis-tests          |  13 +-
 test/crit-recode.py                  |  45 +++---
 test/inhfd/fifo.py                   |   4 +-
 test/inhfd/pipe.py                   |   2 +-
 test/inhfd/socket.py                 |   2 +-
 test/inhfd/tty.py                    |   2 +-
 test/jenkins/criu-lib.sh             |   4 +-
 test/zdtm.py                         | 297 +++++++++++++++++++----------------
 test/zdtm/lib/msg.c                  |   2 +-
 test/zdtm/static/netns-nf.desc       |   2 +-
 test/zdtm/static/sigaltstack.c       |   7 +-
 23 files changed, 276 insertions(+), 215 deletions(-)
 create mode 100644 scripts/travis/docker.env
  

Revisions