From 604dbfbe12a3fb68365601a3605c297f930eb411 Mon Sep 17 00:00:00 2001
From: Bin Lu <bin.lu@arm.com>
Date: Mon, 6 Nov 2017 18:36:56 -0800
Subject: [PATCH] enable integration test on arm64 platform

Currently, integration test can't be done on arm64 platform due to several issues.
 Fix points:
 1, add busybox.tar with arm64 format
 2, add hello-world.tar with arm64 format

Signed-off-by: Bin Lu <bin.lu@arm.com>
---
 Dockerfile                                    |   7 +++---
 tests/integration/helpers.bash                |   8 +++++--
 tests/integration/multi-arch.bash             |  22 ++++++++++++++++++
 .../testdata/hello-world-aarch64.tar          | Bin 0 -> 12800 bytes
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 tests/integration/multi-arch.bash
 create mode 100644 tests/integration/testdata/hello-world-aarch64.tar

diff --git a/Dockerfile b/Dockerfile
index 168d8999..7767ad1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,12 +50,13 @@ RUN mkdir -p /usr/src/criu \
 
 # setup a playground for us to spawn containers in
 ENV ROOTFS /busybox
-RUN mkdir -p ${ROOTFS} \
-    && curl -o- -sSL 'https://github.com/docker-library/busybox/raw/a0558a9006ce0dd6f6ec5d56cfd3f32ebeeb815f/glibc/busybox.tar.xz' | tar xfJC - ${ROOTFS}
-
+RUN mkdir -p ${ROOTFS}
 
 COPY script/tmpmount /
 WORKDIR /go/src/github.com/opencontainers/runc
 ENTRYPOINT ["/tmpmount"]
 
 ADD . /go/src/github.com/opencontainers/runc
+
+RUN . tests/integration/multi-arch.bash \
+    && curl -o- -sSL `get_busybox` | tar xfJC - ${ROOTFS}
diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
index 66dd622a..99d48b7b 100644
--- a/tests/integration/helpers.bash
+++ b/tests/integration/helpers.bash
@@ -2,6 +2,9 @@
 
 # Root directory of integration tests.
 INTEGRATION_ROOT=$(dirname "$(readlink -f "$BASH_SOURCE")")
+
+. ${INTEGRATION_ROOT}/multi-arch.bash
+
 RUNC="${INTEGRATION_ROOT}/../../runc"
 RECVTTY="${INTEGRATION_ROOT}/../../contrib/cmd/recvtty/recvtty"
 GOPATH="$(mktemp -d --tmpdir runc-integration-gopath.XXXXXX)"
@@ -14,7 +17,8 @@ BUSYBOX_IMAGE="$BATS_TMPDIR/busybox.tar"
 BUSYBOX_BUNDLE="$BATS_TMPDIR/busyboxtest"
 
 # hello-world in tar format
-HELLO_IMAGE="$TESTDATA/hello-world.tar"
+HELLO_FILE=`get_hello`
+HELLO_IMAGE="$TESTDATA/$HELLO_FILE"
 HELLO_BUNDLE="$BATS_TMPDIR/hello-world"
 
 # CRIU PATH
@@ -270,7 +274,7 @@ function setup_busybox() {
 		BUSYBOX_IMAGE="/testdata/busybox.tar"
 	fi
 	if [ ! -e $BUSYBOX_IMAGE ]; then
-		curl -o $BUSYBOX_IMAGE -sSL 'https://github.com/docker-library/busybox/raw/a0558a9006ce0dd6f6ec5d56cfd3f32ebeeb815f/glibc/busybox.tar.xz'
+		curl -o $BUSYBOX_IMAGE -sSL `get_busybox`
 	fi
 	tar --exclude './dev/*' -C "$BUSYBOX_BUNDLE"/rootfs -xf "$BUSYBOX_IMAGE"
 	cd "$BUSYBOX_BUNDLE"
diff --git a/tests/integration/multi-arch.bash b/tests/integration/multi-arch.bash
new file mode 100644
index 00000000..52c59bf7
--- /dev/null
+++ b/tests/integration/multi-arch.bash
@@ -0,0 +1,22 @@
+#!/bin/bash
+get_busybox(){
+	case $(go env GOARCH) in
+	arm64)
+		echo 'https://github.com/docker-library/busybox/raw/23fbd9c43e0f4bec7605091bfba23db278c367ac/glibc/busybox.tar.xz'
+	;;
+	*)
+		echo 'https://github.com/docker-library/busybox/raw/a0558a9006ce0dd6f6ec5d56cfd3f32ebeeb815f/glibc/busybox.tar.xz'
+	;;
+	esac
+}
+
+get_hello(){
+	case $(go env GOARCH) in
+        arm64)
+                echo 'hello-world-aarch64.tar'
+        ;;
+        *)
+                echo 'hello-world.tar'
+        ;;
+        esac
+}
diff --git a/tests/integration/testdata/hello-world-aarch64.tar b/tests/integration/testdata/hello-world-aarch64.tar
new file mode 100644
index 0000000000000000000000000000000000000000..186c8aefc47da2e2acc74c636e53204c63253c41
GIT binary patch
literal 12800
zcmeHNO^*~s7_Qmob1=aJi6k1R1rCNRJ>4@qGek^WScLT>M%N|rhCSW2(;d3ICSBG0
zAqUsQ9{|R)axu}lani(t_z#Q`f;Sa0d-Q4o!T0U%f@Z=JcHAZ=R3+V2_161U&(k&2
zRWqi?-3u&X@e--5Shi(#+ihayWwb^qv0HYx)9$odU7J|8-E6f8wJOV~<Tw@5Ng$<?
zXsqVw<i>LH^o=~W)TlbDWle9Af3Rp0+O9e=^so7ExI7j-WR;;k#`>SO+j{+1Mo7sq
zuK$4)m3{_{vHm-4ORxVDO_eo~f8j^}JN{d?=D#x1OOBazE9D+Tjj{f%R#)?1qN%bb
z^6zsYV<)QY1z?Qt|8}RNzyB*Ez2sQ&FG{klZjQmfZNvBff8LWl$wZ#<_kZL+l1}eQ
zpc+@lvYS@7+a2BatNtVQ|8N)p`~PNRkZ?$kr?IT;`PBS35(eA9B@?!Ri{n!KSi8-y
z|7O$DpZ|}=bgKq^7KVJQoNeGI<G;Jn`5zqiHM8@-R=d-jZo$F_{g$QA|29B#YsDYG
z{`Q%PTJ65m3Gyw$-nH6HCd==Hy!(9CEo8^Z4l+Y_lU<qa_6I}InkjmDeWe&wHOVaU
z`wq~&xi?q8x%Xt&Q1#2Xn5bIWZ38)8mx`1x6?v-qNMWaH)WxzBE^KcU4|T98eO14A
zTY8x1lNJTjJlH)ho|>1c6$5Cq4=w|)v+tZE*T1iwn0?{qSF=a2e)+|X{U5OP!@rhu
zxqI=4ZzceaQ*`&`S#Ry<y9T*DN!I4cuC;l9{`0#RfBd=z{VRLc<{`$ub%PxJ&8Q83
zHztOE7{>6Hv2FOLv3+>k*fIRe*f|89Uk=`R?dmB)7OolRZ-DQ8X!i-knEd<fKc{{=
zas8G--Xdh}vsr)gJJi8^>T~!(LKhPr(bL&a3X}B(KM*uxLO6X!h0m7-mA)hCDo+y{
z#BlH)hK>w)Or61iISCAN+GBK?Cl`XaPhFlQ%$4D)S+6f}+GjCK9Ld1R1HV&6G%)2C
zV1&^{4v8$Iy^w4mUa3>tqzf>Rr$yZ`V6g<}v2<L?yv(Q=^BflO*sRm$LngVH4$?3z
z^bcj9o5vv2&^ttf2xpkh9WyAL&80o?)OwUBH(@Xlk2*AF%XumROisA~jB=ODe&G5v
zNn=Eg)hQIV!rT;I*h0hs6yX)gOI?;JP@c*`ngL9mgi$vI0Am1<LOc&3fqbSPm5-31
z5M^@%mxUJ~qcocwwkevYBoM+tW*LEA#;9aT6vR%Lvn7*NDtN?zETAIdkd71e0-!q;
zQ)ob4C&sB!sLu7^6%QoHNe0AnAbnu&2=%gODbqU^NSfw~JxBQU`ujdkGD8YnI;rFl
zJ|6h^EW#szve?T*qd!1<F=6-VdE+z$@TG)Dq|tCgo_b~;3|@qyM!kN9C%G+KaiT#8
z2&1>aV-7f83Pd1F_FyT><}B{RJQ}HBNk0V}@RzSzT-#V`AI+0(D+g*XK6fzdqx>bf
zKD=}9-tkPLZyEuOfJQ(gpb^jrXaqC@8iCCtp!TC1TAIR#w|_hVHe)WC*^g7Rmj<DC
zEbxda*@`44Y%v_^5R>`m7Zd!U$do-Hh}q{b2sd*O$_)c-ZeS0n<6a&1omo-)dbQs_
zQpi=M_UWpB02;7gh4YELsB?^KD1`E9UfsWs;)DKCRmGp1n1LQ4bA{kAZp=$%SE-H7
zDY(k^gY7dYCWGP}#L9XPZlm@c7($s*OiZ1JsB??a`HuEq1zU`-(j2uPov(_o>XRe(
z>&3audT~y(AI8f?*{Ql5yR1iwz;8Yz%yS(P>F!fRAp3=-;&@~H{@-ls-~TISC3i1Y
ctNrg6Mj3;D+tUC4d@B6wAQ}OUz_W|Mzje)nnE(I)

literal 0
HcmV?d00001