[CRIU] [PATCH] Revert "zdtm: add ability to execute non-namespacess tests concurrently"

[Pavel Emelyanov]

On 08/12/2014 06:14 PM, Andrew Vagin wrote:
> I don't know how to re-execute zdtm.sh with the same options and
> I spent about one hour to find a solution without any success.

I thought that

	zdth.sh $@

or

	zdtm.sh "$@"

does the trick. No?

> I don't have time to fix this issue now, so can we revert the patch and
> then I will send a fixed version again.

Why not send the fix instead of fixed version?

> Now the btrfs job fails, because it wants to exclued a few tests:
> ./zdtm.sh --ct -C -x '\(maps04\|mountpoints\|inotify_irmap\)'
> 
> but zdtm.sh is re-executed with wrong options:
> ./zdtm.sh -C -x \(maps04\|mountpoints\|inotify_irmap\) ns/static/inotify_irmap

Is that the only problem? Why does ns/static/inotify_irmap appear
at the tail?

> Signed-off-by: Andrew Vagin <avagin at openvz.org>
> ---
>  test/Makefile | 10 +++++-----
>  test/zdtm.sh  | 21 ---------------------
>  2 files changed, 5 insertions(+), 26 deletions(-)
> 
> diff --git a/test/Makefile b/test/Makefile
> index 5d04805..351b37b 100644
> --- a/test/Makefile
> +++ b/test/Makefile
> @@ -16,9 +16,11 @@ other: .FORCE
>  		$(MAKE) -C $$t run || break;	\
>  	done					\
>  
> -zdtm: .FORCE 
> +zdtm: .FORCE
>  	$(MAKE) zdtm_ns
> -	$(MAKE) zdtm_nons
> +	for t in $(shell echo "$(TST)" | tr ' ' '\n' | grep -Pv $(EXP)); do \
> +		$(MAKE) $$t || break;	\
> +	done
>  .PHONY: zdtm
>  
>  fault-injection: .FORCE
> @@ -26,9 +28,7 @@ fault-injection: .FORCE
>  .PHONY: fault-injection
>  
>  zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | grep -P $(EXP))
> -zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | grep -vP $(EXP))
> -
>  $(TST):
> -	./zdtm.sh --ct ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log || \
> +	./zdtm.sh ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log || \
>  	{ flock Makefile cat $(subst /,_,$@).log; exit 1; }
>  .PHONY: zdtm_ns
> diff --git a/test/zdtm.sh b/test/zdtm.sh
> index 569ce94..24a15b2 100755
> --- a/test/zdtm.sh
> +++ b/test/zdtm.sh
> @@ -763,7 +763,6 @@ Options:
>  	-P : Make pre-dump instead of dump on all iterations except the last one
>  	-s : Make iterative snapshots. Only the last one will be checked.
>  	--auto-dedup : Make auto-dedup on restore. Check sizes of pages imges, it must be zero.
> -	--ct : re-execute $0 in a container
>  EOF
>  }
>  
> @@ -870,26 +869,6 @@ while :; do
>  		usage
>  		exit 0
>  		;;
> -	  --ct)
> -		[ -z "$ZDTM_SH_IN_CT" ] && {
> -			export ZDTM_SH_IN_CT=1
> -			shift
> -			args="$@"
> -			# pidns is used to avoid conflicts
> -			# mntns is used to mount /proc
> -			# net is used to avoid conflicts of parasite sockets
> -			unshare --pid --mount --ipc --net -- bash -c "
> -				(
> -					ip link set up dev lo &&
> -					mount --make-rprivate / &&
> -					umount -l /proc &&
> -					mount -t proc proc /proc/ &&
> -					./zdtm.sh $args
> -				)"
> -			exit
> -		}
> -		shift
> -		;;
>  	  -*)
>  		echo "Unrecognized option $1, aborting!" 1>&2
>  		usage
>