From 1cc3b32f4c6c52203d070c5bb2d88c27aa65ffbc Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 16 Jun 2018 01:45:50 +0200 Subject: build/test: skip empty TEST_TAG, TEST_FILTER - Empty "--tags=", "--filter=" prevents TEST_FILE from running. - Fix another bug: TEST_FILTER overwrote TEST_TAG. --- cmake/RunTests.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 5b62fd72c9..a51990e925 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -24,12 +24,12 @@ if(BUSTED_OUTPUT_TYPE STREQUAL junit) set(EXTRA_ARGS OUTPUT_FILE ${BUILD_DIR}/${TEST_TYPE}test-junit.xml) endif() -if(DEFINED ENV{TEST_TAG}) +if(DEFINED ENV{TEST_TAG} AND NOT "$ENV{TEST_TAG}" STREQUAL "") set(TEST_TAG "--tags=$ENV{TEST_TAG}") endif() -if(DEFINED ENV{TEST_FILTER}) - set(TEST_TAG "--filter=$ENV{TEST_FILTER}") +if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "") + set(TEST_FILTER "--filter=$ENV{TEST_FILTER}") endif() execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${WORKING_DIR}/Xtest-tmpdir) -- cgit