Skip to content

Commit a199f62

Browse files
committed
Add an easy cleanup for tests
The `make clean` target now cleans up the `/tmp` area a bit. It leaves around the cache of the `busybox` image to avoid fetching it too often. Signed-off-by: Peter Portante <peter.portante@redhat.com>
1 parent efc9256 commit a199f62

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ docs:
106106
.PHONY: clean
107107
clean:
108108
rm -rf bin/ src/*.o src/*.gcno src/*.gcda *.gcov
109+
$(MAKE) -C test clean
109110
$(MAKE) -C docs clean
110111

111112
.PHONY: install install.bin install.crio install.podman podman crio

test/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.PHONY: clean
2+
clean:
3+
chmod -R 700 /tmp/conmon-test-*
4+
rm -rf /tmp/conmon-test-* /tmp/conmon-term.*

test/test_helper.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RUNTIME_BINARY="${RUNTIME_BINARY:-/usr/bin/runc}"
2525

2626
# UBI10-micro container image for test rootfs
2727
UBI10_MICRO_IMAGE="registry.access.redhat.com/ubi10/ubi-micro:latest"
28-
ROOTFS_CACHE_DIR="/tmp/conmon-test-images"
29-
ROOTFS_CACHE_MARKER="/tmp/conmon-test-images/.ubi10-micro-cached"
28+
ROOTFS_CACHE_DIR="/tmp/conmon-images"
29+
ROOTFS_CACHE_MARKER="/tmp/conmon-images/.ubi10-micro-cached"
3030
VALID_PATH="/tmp"
3131
INVALID_PATH="/not/a/path"
3232

0 commit comments

Comments
 (0)