diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-24 04:43:08 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-05-29 17:35:35 -0300 |
commit | fb11081becb80d681c2c8ab61125b42b12961314 (patch) | |
tree | 65ec3be0da6000b92dd65ef98b388e5636b8759d /test | |
parent | build: define CC/GAWK if undefined (diff) | |
download | firejail-fb11081becb80d681c2c8ab61125b42b12961314.tar.gz firejail-fb11081becb80d681c2c8ab61125b42b12961314.tar.zst firejail-fb11081becb80d681c2c8ab61125b42b12961314.zip |
build: allow overriding common tools
Tools:
* gzip
* install
* rm
* strip
* tar
For the programs not checked in configure.ac:
From the manual of GNU Autoconf (version 2.71):
> If you use `AC_PROG_INSTALL`, you must include `install-sh` in your
> distribution
So set `install` just in the Makefile. Use `$(RM)` to ensure that `-f`
is always used and to make it easier to spot when `-r` is used.
See commit 93d623fdf ("build: allow overriding certain tools",
2024-02-23) / PR #6222.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile index 52fada86c..89855d082 100644 --- a/test/Makefile +++ b/test/Makefile | |||
@@ -2,6 +2,8 @@ | |||
2 | ROOT = .. | 2 | ROOT = .. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | RM ?= rm -f | ||
6 | |||
5 | TESTS=$(patsubst %/,%,$(wildcard */)) | 7 | TESTS=$(patsubst %/,%,$(wildcard */)) |
6 | 8 | ||
7 | .PHONY: $(TESTS) | 9 | .PHONY: $(TESTS) |
@@ -11,14 +13,14 @@ $(TESTS): | |||
11 | 13 | ||
12 | .PHONY: clean | 14 | .PHONY: clean |
13 | clean: | 15 | clean: |
14 | for test in $(TESTS); do rm -f "$$test/$$test.log"; done | 16 | for test in $(TESTS); do $(RM) "$$test/$$test.log"; done |
15 | rm -fr environment/-testdir | 17 | $(RM) -r environment/-testdir |
16 | rm -f environment/index.html* | 18 | $(RM) environment/index.html* |
17 | rm -f environment/logfile* | 19 | $(RM) environment/logfile* |
18 | rm -f environment/wget-log* | 20 | $(RM) environment/wget-log* |
19 | rm -f sysutils/firejail_t* | 21 | $(RM) sysutils/firejail_t* |
20 | rm -f utils/firejail-test-file* | 22 | $(RM) utils/firejail-test-file* |
21 | rm -f utils/index.html* | 23 | $(RM) utils/index.html* |
22 | rm -f utils/lstesting | 24 | $(RM) utils/lstesting |
23 | rm -f utils/wget-log | 25 | $(RM) utils/wget-log |
24 | cd compile && (./compile.sh --clean || true) | 26 | cd compile && (./compile.sh --clean || true) |