diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-20 18:31:10 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:51:29 +0100 |
| commit | 108d00a6b2a1bfa7ec5550acdf4b12915d132d96 (patch) | |
| tree | e1210a11061103edb74cbf1c0a5312380c26f4fe | |
| parent | ec43f6862eeafa1d737b60c8c812066f7cf1ff7a (diff) | |
| download | systemd-108d00a6b2a1bfa7ec5550acdf4b12915d132d96.tar.gz | |
test: simplify the Makefiles
has-overflow was a temporary hack that was removed in
844da987ef8b8c98f837d3328eeb3ed481f43835 (Oct. 2016). All the makefiles
can be the same, and all the targets can be handled identically.
| -rw-r--r-- | test/TEST-01-BASIC/Makefile | 5 | ||||
| l---------[-rw-r--r--] | test/TEST-13-NSPAWN-SMOKE/Makefile | 11 | ||||
| -rw-r--r-- | test/test-functions | 2 |
3 files changed, 3 insertions, 15 deletions
diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile index 45e9bfc67c..79fe9688b8 100644 --- a/test/TEST-01-BASIC/Makefile +++ b/test/TEST-01-BASIC/Makefile @@ -1,9 +1,6 @@ BUILD_DIR=$(shell ../../tools/find-build-dir.sh) -all setup run: +all setup run clean clean-again: @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ -clean clean-again: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --clean - .PHONY: all setup run clean clean-again diff --git a/test/TEST-13-NSPAWN-SMOKE/Makefile b/test/TEST-13-NSPAWN-SMOKE/Makefile index e5e3350211..e9f93b1104 100644..120000 --- a/test/TEST-13-NSPAWN-SMOKE/Makefile +++ b/test/TEST-13-NSPAWN-SMOKE/Makefile @@ -1,10 +1 @@ -BUILD_DIR=$(shell ../../tools/find-build-dir.sh) - -all setup run: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ - -clean clean-again: - @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean - @rm -f has-overflow - -.PHONY: all setup run clean clean-again +../TEST-01-BASIC/Makefile
\ No newline at end of file diff --git a/test/test-functions b/test/test-functions index 64afa8e3f1..d1595fcd60 100644 --- a/test/test-functions +++ b/test/test-functions @@ -2039,7 +2039,7 @@ do_test() { test_setup test_setup_cleanup ;; - --clean) + --clean|--clean-again) echo "TEST CLEANUP: $TEST_DESCRIPTION" test_cleanup ;; |