From 712df31f9cb4028d415dca21789489a9249e2b18 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 12 May 2017 18:55:14 +0200 Subject: [PATCH] Makefile: clean and rebuild binaries before testing if you run `make localintegration` from a branch, switch to another and re-run the command again, `ocid` won't get built again causing tests to run with binaries from the old branch you switched from. This patch makes sure we cleanup binaries and rebuild before running tests. Signed-off-by: Antonio Murdaca --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9e211a3c..31d0a69e 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ dbuild: ocidimage integration: ocidimage docker run -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${OCID_IMAGE} make localintegration -localintegration: binaries +localintegration: clean binaries ./test/test_runner.sh ${TESTFLAGS} binaries: ocid ocic kpod conmon pause bin2img copyimg checkseccomp