[9/9] alpine: compile all tests

Submitted by Andrei Vagin on Sept. 29, 2017, 10:41 p.m.

Details

Message ID 20170929224145.6764-9-avagin@openvz.org
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrei Vagin Sept. 29, 2017, 10:41 p.m.
From: Andrei Vagin <avagin@virtuozzo.com>

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 scripts/build/Dockerfile.alpine | 13 ++++++++-----
 scripts/travis/Makefile         |  5 ++++-
 scripts/travis/asan.sh          |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 1c4684922..01380a532 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -1,4 +1,4 @@ 
-FROM alpine:3.5
+FROM alpine:3.6
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
@@ -20,8 +20,8 @@  RUN apk update && apk add \
 COPY . /criu
 WORKDIR /criu
 ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp && make mrproper && ccache -s && \
-	date && make -j $(nproc) CC="$CC" && date
+RUN mv .ccache /tmp && make mrproper && ccache -s && ccache -z &&\
+	date && make -j $(nproc) CC="$CC" && date && ccache -s
 
 # Run a test
 RUN apk add	py-yaml \
@@ -29,5 +29,8 @@  RUN apk add	py-yaml \
 		ip6tables \
 		iptables \
 		iproute2 \
-	&& pip install protobuf \
-	&& make -C test/zdtm/static env00
+		tar \
+		bash
+
+RUN pip install protobuf ipaddr
+RUN make -C test/zdtm
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 25b087df7..d7fc55dad 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -12,12 +12,15 @@  ifdef CLANG
 endif
 
 TARGETS := fedora-asan alpine fedora-rawhide
+ZDTM_OPTIONS :=
+
+alpine: ZDTM_OPTIONS="-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00"
 
 $(TARGETS):
 	echo 'DOCKER_OPTS="--storage-driver=devicemapper"' > /etc/default/docker
 	restart docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-$@ ./scripts/travis/asan.sh
+	docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)
 
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/travis/asan.sh b/scripts/travis/asan.sh
index 5b34da61e..15bfe53fe 100755
--- a/scripts/travis/asan.sh
+++ b/scripts/travis/asan.sh
@@ -8,7 +8,7 @@  chmod 0777 test
 chmod 0777 test/zdtm/transition/
 chmod 0777 test/zdtm/static
 
-./test/zdtm.py run -a --keep-going -k always --parallel 4 -x zdtm/static/rtc
+./test/zdtm.py run -a --keep-going -k always --parallel 4 -x zdtm/static/rtc "$@"
 ret=$?
 
 for i in `find / -name 'asan.log*'`; do