[CRIU] [PATCH] zdtm: Add vdso01 test case

Andrew Vagin avagin at parallels.com
Wed Jun 25 03:36:48 PDT 2014


On Mon, Jun 23, 2014 at 11:27:34PM +0400, Cyrill Gorcunov wrote:
> On Mon, Jun 23, 2014 at 11:05:06PM +0400, Cyrill Gorcunov wrote:
> > On Mon, Jun 23, 2014 at 10:55:11PM +0400, Andrew Vagin wrote:
> > > > > We can use a macros to determine x86_64.
> > > > > 
> > > > > #if __x86_64__
> > > > > /* 64-bit */
> > > > > #endif
> > > > 
> > > > Can we do that somehow in bash instead?
> > > 
> > > You can do it in zdtm, but the macros looks easier.
> > 
> > Andrew, as discussed face to face -- I'll do that on bash
> > level. Can we merge it as is since it won't cause any harm
> > and then I send patch on top which enables it.
> 
> Say something like attached?
> From 6259a5f8af9c54f1980e78831cf402d4564328bd Mon Sep 17 00:00:00 2001
> From: Cyrill Gorcunov <gorcunov at openvz.org>
> Date: Mon, 23 Jun 2014 23:26:53 +0400
> Subject: [PATCH] zdtm: Add arch specific tests
> 
> To be able to run specific tests depending on
> architecture we're executing on.
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  test/zdtm.sh | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/test/zdtm.sh b/test/zdtm.sh
> index 1aa4b30f1bb7..5837fc488d57 100755
> --- a/test/zdtm.sh
> +++ b/test/zdtm.sh
> @@ -1,5 +1,14 @@
>  #!/bin/bash
>  
> +ARCH=`uname -m | sed			\
> +		-e s/i.86/i386/		\
> +		-e s/sun4u/sparc64/	\
> +		-e s/s390x/s390/	\
> +		-e s/parisc64/parisc/	\
> +		-e s/ppc.*/powerpc/	\
> +		-e s/mips.*/mips/	\
> +		-e s/sh[234].*/sh/`
> +
>  ZP="zdtm/live"
>  
>  TEST_LIST="
> @@ -109,6 +118,15 @@ static/chroot-file
>  static/rtc
>  transition/maps007
>  "
> +
> +#
> +# Arch specific tests
> +if [ $ARCH = "x86_64" ]; then

if "$ARCH" = "x86_64"; then

> +	TEST_LIST_ARCH="static/vdso01"

sse* should be here too.

> +fi
> +
> +TEST_LIST=$TEST_LIST$TEST_LIST_ARCH

Will it work w/o newline between them?

> +
>  # Duplicate list with ns/ prefix
>  TEST_LIST=$TEST_LIST$(echo $TEST_LIST | tr ' ' '\n' | sed 's#^#ns/#')
>  
> -- 
> 1.9.3
> 



More information about the CRIU mailing list