From 89ccc2b233822409c7f104facac9d3293252eea4 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 21 May 2023 20:08:00 +0200 Subject: test: shuffle files around --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 054e75b..56340ea 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ test/all: test/local test/docker .PHONY: test/local test/local: - ./test/unit/test.sh + ./test/local/test.sh test/docker/%: DO cd test && \ -- cgit v1.2.3 From 3af293cba20c02b5ab8d8d26fe670af82ff1b78d Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 21 May 2023 20:17:11 +0200 Subject: t/d: move docker-compose.yml to docker/ --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 56340ea..fa67f31 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,12 @@ test/all: test/local test/docker test/local: ./test/local/test.sh +.PHONY: test/linux-home +test/linux-home: + ./test/linux-home/test.sh + test/docker/%: DO - cd test && \ + cd test/docker && \ DISTRO='$*' docker-compose build --pull && \ docker-compose run --rm test && \ docker-compose down -v -- cgit v1.2.3 From f9f0b361414b17d28de889de8d7d7212976d350a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 21 May 2023 20:26:40 +0200 Subject: use `--progress plain` with docker-compose build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fa67f31..23de6d3 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ test/linux-home: test/docker/%: DO cd test/docker && \ - DISTRO='$*' docker-compose build --pull && \ + DISTRO='$*' docker-compose build --force-rm --progress plain --pull -q && \ docker-compose run --rm test && \ docker-compose down -v -- cgit v1.2.3