shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

test: simplify the Makefiles

Browse Source 
has-overflow was a temporary hack that was removed in
844da987ef (Oct. 2016). All the makefiles
can be the same, and all the targets can be handled identically.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-03-20 18:31:10 +01:00
parent ec43f6862e
commit 108d00a6b2
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/TEST-01-BASIC/Makefile
View File

@ -1,9 +1,6 @@
BUILD_DIR=$(shell ../../tools/find-build-dir.sh) 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 --$@ @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 .PHONY: all setup run clean clean-again

10
test/TEST-13-NSPAWN-SMOKE/Makefile
View File

@ -1,10 +0,0 @@
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

1
test/TEST-13-NSPAWN-SMOKE/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

2
test/test-functions
View File

@ -2039,7 +2039,7 @@ do_test() {
test_setup test_setup
test_setup_cleanup test_setup_cleanup
;; ;;
--clean) --clean|--clean-again)
echo "TEST CLEANUP: $TEST_DESCRIPTION" echo "TEST CLEANUP: $TEST_DESCRIPTION"
test_cleanup test_cleanup
;; ;;