From 1dd6c1d716625ba47bbbf42a65deba364f24f9f3 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 16 Nov 2021 15:02:05 -0800 Subject: [PATCH] Clean up fully after successful Docker btests If we leave files sitting around, we trigger a Docker image double-build in CI, because the build runs once, gets tested, and then gets run again when we push the Docker image: the additional btest files cause Docker to detect a different source tree, causing an image layer violation. Also rename "cleanup" target to "clean", to align with rest of our tree. --- docker/btest/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/btest/Makefile b/docker/btest/Makefile index 65d4d65c98..30d0348a72 100644 --- a/docker/btest/Makefile +++ b/docker/btest/Makefile @@ -1,11 +1,11 @@ DIAG=diag.log BTEST=../../auxil/btest/btest -all: cleanup btest-verbose +all: btest-verbose clean # Showing all tests. btest-verbose: @$(BTEST) -d -j -f $(DIAG) -cleanup: - @rm -f $(DIAG) +clean: + @rm -rf $(DIAG) .tmp .btest.failed.dat