[CRIU] [PATCH 2/3] travis: build tests in docker containers

Andrei Vagin avagin at openvz.org
Thu Dec 29 17:28:37 PST 2016


From: Andrei Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
 scripts/build/Dockerfile.tmpl | 1 +
 test/zdtm/static/autofs.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 963005f..6be3fb3 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -26,4 +26,5 @@ RUN make -j $(nproc) CC=$CC criu/parasite-syscall.o
 RUN make -j $(nproc) CC=$CC
 RUN make mrproper
 RUN bash -c 'CLEAN="$(git clean -ndx --exclude=scripts/build --exclude=.config)"; echo "${CLEAN}"; test -z "${CLEAN}"; exit $?'
+RUN make -j $(nproc) CC=$CC -C test/zdtm
 #RUN make test/compel/handle_binary && ./test/compel/handle_binary
diff --git a/test/zdtm/static/autofs.c b/test/zdtm/static/autofs.c
index 2cfeb51..1238e67 100644
--- a/test/zdtm/static/autofs.c
+++ b/test/zdtm/static/autofs.c
@@ -227,7 +227,7 @@ static int check_fd(struct autofs_params *p)
 	}
 	if (st.st_blksize != p->fd_stat.st_blksize) {
 		pr_err("%s: st_blksize differs %ld != %ld:\n", p->mountpoint,
-				st.st_blksize, p->fd_stat.st_blksize);
+				(long)st.st_blksize, (long)p->fd_stat.st_blksize);
 		ret++;
 	}
 	if (st.st_blocks != p->fd_stat.st_blocks) {
-- 
2.7.4



More information about the CRIU mailing list