[lxc-devel] [PATCH] tests: Don't hardcode architecture

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> If on Ubuntu, then match the host's own architecture, this should allow
> for our tests to pass on the armhf CI environment.
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/tests/lxc-test-autostart  |  7 ++++++-
>  src/tests/lxc-test-unpriv     |  7 ++++++-
>  src/tests/lxc-test-usernic.in | 12 +++++++++++-
>  3 files changed, 23 insertions(+), 3 deletions(-)
> 
> diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart
> index 6c2acb0..62fff26 100755
> --- a/src/tests/lxc-test-autostart
> +++ b/src/tests/lxc-test-autostart
> @@ -32,12 +32,17 @@ cleanup() {
>  	echo "PASS"
>  }
>  
> +ARCH=i386
> +if type dpkg >/dev/null 2>&1; then
> +	ARCH=$(dpkg --print-architecture)
> +fi
> +
>  trap cleanup EXIT HUP INT TERM
>  set -eu
>  
>  # Create a container
>  CONTAINER_NAME=lxc-test-auto
> -lxc-create -t download -n $CONTAINER_NAME -- -d ubuntu -r trusty -a i386
> +lxc-create -t download -n $CONTAINER_NAME -- -d ubuntu -r trusty -a $ARCH
>  CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs -H))
>  cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak
>  
> diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
> index 9e3fe21..cc0a860 100755
> --- a/src/tests/lxc-test-unpriv
> +++ b/src/tests/lxc-test-unpriv
> @@ -62,6 +62,11 @@ run_cmd() {
>  TUSER=lxcunpriv
>  HDIR=/home/$TUSER
>  
> +ARCH=i386
> +if type dpkg >/dev/null 2>&1; then
> +	ARCH=$(dpkg --print-architecture)
> +fi
> +
>  trap cleanup EXIT SIGHUP SIGINT SIGTERM
>  set -eu
>  
> @@ -94,7 +99,7 @@ for d in /sys/fs/cgroup/*; do
>  	echo $$ > $d/lxctest/tasks
>  done
>  
> -run_cmd lxc-create -t download -n c1 -- -d ubuntu -r trusty -a i386
> +run_cmd lxc-create -t download -n c1 -- -d ubuntu -r trusty -a $ARCH
>  run_cmd lxc-start -n c1 -d
>  
>  p1=$(run_cmd lxc-info -n c1 -p -H)
> diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
> index 4f96d2e..0a514ee 100755
> --- a/src/tests/lxc-test-usernic.in
> +++ b/src/tests/lxc-test-usernic.in
> @@ -64,6 +64,11 @@ run_cmd() {
>  	fi
>  }
>  
> +ARCH=i386
> +if type dpkg >/dev/null 2>&1; then
> +	ARCH=$(dpkg --print-architecture)
> +fi
> +
>  set -eu
>  trap cleanup EXIT SIGHUP SIGINT SIGTERM
>  
> @@ -96,8 +101,13 @@ brctl addbr usernic-br1
>  ifconfig usernic-br0 0.0.0.0 up
>  ifconfig usernic-br1 0.0.0.0 up
>  
> +ARCH=i386
> +if type dpkg >/dev/null 2>&1; then
> +	ARCH=$(dpkg --print-architecture)
> +fi
> +
>  # Create three containers
> -run_cmd "lxc-create -t download -n b1 -- -d ubuntu -r trusty -a i386"
> +run_cmd "lxc-create -t download -n b1 -- -d ubuntu -r trusty -a $ARCH"
>  run_cmd "lxc-start -n b1 -d"
>  p1=$(run_cmd "lxc-info -n b1 -p -H")
>  
> -- 
> 1.9.rc1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel