summaryrefslogtreecommitdiffhomepage
path: root/src/tests
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-16 03:39:32 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-16 03:39:32 +0200
commitbde7e0ccab2255fc118c298cf00b757b7a890779 (patch)
tree581ac08038e8297ea5c8c594b0d42614cf78593a /src/tests
parent690642c42e1e3faccc0d6015c2cfc928a2696f2d (diff)
qemu: always pull and reset against integration tree
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/qemu/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index eed7d4d..8d76394 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -229,6 +229,11 @@ $(KERNEL_PATH)/.installed:
mkdir -p $(dir $(KERNEL_PATH))
flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git clone $(GIT_URI_$(patsubst %-git,%,$(patsubst %-debug,%,$(KERNEL_VERSION)))) $(KERNEL_PATH)
touch $@
+always-pull: $(KERNEL_PATH)/.installed
+ flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git -C $(KERNEL_PATH) fetch
+ flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git -C $(KERNEL_PATH) reset --hard FETCH_HEAD
+.PHONY: always-pull
+$(KERNEL_BZIMAGE): always-pull
endif
$(KERNEL_PATH)/.config: kernel.config arch/$(QEMU_ARCH).config | $(KERNEL_PATH)/.installed