[CRIU] [PATCH 2/3] zdtm: replace noauto on crfail where it's possible

Pavel Emelyanov xemul at virtuozzo.com
Tue Jun 7 04:52:37 PDT 2016


> diff --git a/test/zdtm/static/cow00.desc b/test/zdtm/static/cow00.desc
> index 95c58b4..c303c11 100644
> --- a/test/zdtm/static/cow00.desc
> +++ b/test/zdtm/static/cow00.desc
> @@ -1 +1,2 @@
> -{'flags': 'noauto'}
> +# /proc/pid/pagemap doesn't show phys addr for unprivileged users
> +{'flavor': 'ns h', 'flags': 'suid'}

Doesn't fit the subject :)

> diff --git a/test/zdtm/static/inotify02.desc b/test/zdtm/static/inotify02.desc
> index 95c58b4..92b2cf5 100644
> --- a/test/zdtm/static/inotify02.desc
> +++ b/test/zdtm/static/inotify02.desc
> @@ -1 +1 @@
> -{'flags': 'noauto'}
> +{'flags' : (lambda a: int(a[0]) * 100 + int(a[1]))(os.uname()[2].split('.')) < 400 and "noauto" or ""}

Please, let's try hard to avoid python code in .desc files.
Let's add check --feature requirement or kernel version.

> diff --git a/test/zdtm/static/pty02.desc b/test/zdtm/static/pty02.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/static/pty02.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Doesn't fit the subject.

> diff --git a/test/zdtm/static/socket_aio.desc b/test/zdtm/static/socket_aio.desc
> index 95c58b4..6b0e5a3 100644
> --- a/test/zdtm/static/socket_aio.desc
> +++ b/test/zdtm/static/socket_aio.desc
> @@ -1 +1 @@
> -{'flags': 'noauto'}
> +{'opts': '--tcp-established'}

Doesn't fit the subject. Also, I don't remember that we support sockets AIO in criu :\

> diff --git a/test/zdtm/static/tty00.desc b/test/zdtm/static/tty00.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/static/tty00.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Doesn't fit the subject.

> diff --git a/test/zdtm/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
> index 95c58b4..847e3b2 100644
> --- a/test/zdtm/static/unhashed_proc.desc
> +++ b/test/zdtm/static/unhashed_proc.desc
> @@ -1 +1 @@
> -{'flags': 'noauto'}
> +{'flags': 'crfail', 'opts' : '--link-remap'}

Why is link-remap required for PROC???

> diff --git a/test/zdtm/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
> index 95c58b4..ded8987 100644
> --- a/test/zdtm/static/unlink_largefile.desc
> +++ b/test/zdtm/static/unlink_largefile.desc
> @@ -1 +1 @@
> -{'flags': 'noauto'}
> +{'flags': 'crfail'}

Nice test to test --ghost-size option ;)

> diff --git a/test/zdtm/transition/epoll.desc b/test/zdtm/transition/epoll.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/transition/epoll.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Doesn't fit the subject.

> diff --git a/test/zdtm/transition/fifo_loop.desc b/test/zdtm/transition/fifo_loop.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/transition/fifo_loop.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Same.

> diff --git a/test/zdtm/transition/file_aio.desc b/test/zdtm/transition/file_aio.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/transition/file_aio.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Same.

> diff --git a/test/zdtm/transition/netlink00.desc b/test/zdtm/transition/netlink00.desc
> index 95c58b4..1e9fff8 100644
> --- a/test/zdtm/transition/netlink00.desc
> +++ b/test/zdtm/transition/netlink00.desc
> @@ -1 +1 @@
> -{'flags': 'noauto'}
> +{'flags': 'suid noauto'}

Huh?

> diff --git a/test/zdtm/transition/socket_loop00.desc b/test/zdtm/transition/socket_loop00.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/transition/socket_loop00.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}

Doesn't fit the subject.

> diff --git a/test/zdtm/transition/unix_sock.desc b/test/zdtm/transition/unix_sock.desc
> deleted file mode 100644
> index 95c58b4..0000000
> --- a/test/zdtm/transition/unix_sock.desc
> +++ /dev/null
> @@ -1 +0,0 @@
> -{'flags': 'noauto'}
> 

Same.


More information about the CRIU mailing list