[CRIU] Re: [PATCH 2/3] zdtm: fix bashisms

Andrey Vagin avagin at parallels.com
Wed Sep 12 06:07:18 EDT 2012


Acked-by: Andrey Vagin <avagin at parallels.com>

On Wed, Sep 12, 2012 at 02:01:37PM +0400, Konstantin Khlebnikov wrote:
> `< $FILE` isn't posix compatible and doesn't work in dash
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
> ---
>  test/zdtm/live/static/Makefile |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
> index 7f7ed0e..73571a5 100644
> --- a/test/zdtm/live/static/Makefile
> +++ b/test/zdtm/live/static/Makefile
> @@ -143,7 +143,7 @@ fifo-rowo-pair.pid: fifo-rowo-pair
>  	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --name_master=$<.master.test --name_slave=$<.slave.test
>  
>  %.out:	%.pid %
> -	-kill -TERM `< $<`
> +	-kill -TERM `cat $<`
>  
>  $(TST_STATE:%=%.state):	%.state: %
>  	$(<D)/$(<F) --statefile=$@ --outfile=$<.out start
> @@ -154,7 +154,7 @@ $(TST_STATE:%=%.out): %.out: % %.state
>  start:	$(PID) $(STATE)
>  
>  %.is_running:	%.pid
> -	kill -0 `< $<`
> +	kill -0 `cat $<`
>  
>  check_start:	$(PID:%.pid=%.is_running)
>  
> diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
> index 4d594c1..e62ee75 100644
> --- a/test/zdtm/live/streaming/Makefile
> +++ b/test/zdtm/live/streaming/Makefile
> @@ -36,12 +36,12 @@ $(TST_FILE:%=%.pid):	%.pid:	%
>  	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --filename=$<.test
>  
>  %.out:	%.pid %
> -	-kill -TERM `< $<`
> +	-kill -TERM `cat $<`
>  
>  start:	$(PID)
>  
>  %.is_running:	%.pid
> -	kill -0 `< $<`
> +	kill -0 `cat $<`
>  
>  check_start:	$(PID:%.pid=%.is_running)
>  
> diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
> index 64e004b..5ac40b0 100644
> --- a/test/zdtm/live/transition/Makefile
> +++ b/test/zdtm/live/transition/Makefile
> @@ -33,12 +33,12 @@ $(TST_FILE:%=%.pid):	%.pid:	%
>  	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --filename=$<.test
>  
>  %.out:	%.pid %
> -	-kill -TERM `< $<`
> +	-kill -TERM `cat $<`
>  
>  start:	$(PID)
>  
>  %.is_running:	%.pid
> -	kill -0 `< $<`
> +	kill -0 `cat $<`
>  
>  check_start:	$(PID:%.pid=%.is_running)
>  
> 


More information about the CRIU mailing list