From: Dan Streetman Date: Tue, 17 Nov 2020 21:10:29 +0000 (-0500) Subject: test: remove unused 'basedir' var from integration test makefiles X-Git-Tag: v248-rc1~246^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4326586be28a2a41be2fa1fe8abe4941566a9610;p=thirdparty%2Fsystemd.git test: remove unused 'basedir' var from integration test makefiles --- diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile index 79fe9688b81..bee382b8b1c 100644 --- a/test/TEST-01-BASIC/Makefile +++ b/test/TEST-01-BASIC/Makefile @@ -1,6 +1,6 @@ BUILD_DIR=$(shell ../../tools/find-build-dir.sh) all setup run clean clean-again: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ + @TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ .PHONY: all setup run clean clean-again diff --git a/test/TEST-52-HONORFIRSTSHUTDOWN/Makefile b/test/TEST-52-HONORFIRSTSHUTDOWN/Makefile index a06599081b4..46a28ac810e 100644 --- a/test/TEST-52-HONORFIRSTSHUTDOWN/Makefile +++ b/test/TEST-52-HONORFIRSTSHUTDOWN/Makefile @@ -1,7 +1,7 @@ BUILD_DIR=$(shell ../../tools/find-build-dir.sh) all setup run clean clean-again: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ + @TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@ # finish option is used to run checks that can only be run outside of # the test execution. Example case, honor first shutdown, proof is obtained @@ -11,6 +11,6 @@ all setup run clean clean-again: # the test will loop and will be terminated via a command timeout. # This just provides concrete confirmation. finish: - @basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./fini.sh --$@ + @TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./fini.sh --$@ .PHONY: all setup run clean clean-again finish