JDevlieghere updated this revision to Diff 243010.
JDevlieghere added a comment.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Make EXCLUDE_FROM_ALL an argument to `add_lit_testsuite`
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74168/new/
https://reviews.llvm.org/D74168
Files:
lldb/test/Shell/CMakeLists.txt
llvm/cmake/modules/AddLLVM.cmake
Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -1560,10 +1560,10 @@
# A function to add a set of lit test suites to be driven through 'check-*'
targets.
function(add_lit_testsuite target comment)
- cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
+ cmake_parse_arguments(ARG "EXCLUDE_FROM_ALL" "" "PARAMS;DEPENDS;ARGS"
${ARGN})
# EXCLUDE_FROM_ALL excludes the test ${target} out of check-all.
- if(NOT EXCLUDE_FROM_ALL)
+ if(NOT EXCLUDE_FROM_ALL AND NOT ARG_EXCLUDE_FROM_ALL)
# Register the testsuites, params and depends for the global check rule.
set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES
${ARG_UNPARSED_ARGUMENTS})
set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${ARG_PARAMS})
Index: lldb/test/Shell/CMakeLists.txt
===================================================================
--- lldb/test/Shell/CMakeLists.txt
+++ lldb/test/Shell/CMakeLists.txt
@@ -21,6 +21,7 @@
"Running lldb shell test suite with reproducer capture"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-repro=capture"
+ EXCLUDE_FROM_ALL
DEPENDS lldb-test-deps)
# Add a lit test suite that runs the shell test by replaying a reproducer.
@@ -28,5 +29,6 @@
"Running lldb shell test suite with reproducer replay"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-repro=replay"
+ EXCLUDE_FROM_ALL
DEPENDS lldb-test-deps)
add_dependencies(check-lldb-repro check-lldb-repro-capture)
Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -1560,10 +1560,10 @@
# A function to add a set of lit test suites to be driven through 'check-*' targets.
function(add_lit_testsuite target comment)
- cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
+ cmake_parse_arguments(ARG "EXCLUDE_FROM_ALL" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
# EXCLUDE_FROM_ALL excludes the test ${target} out of check-all.
- if(NOT EXCLUDE_FROM_ALL)
+ if(NOT EXCLUDE_FROM_ALL AND NOT ARG_EXCLUDE_FROM_ALL)
# Register the testsuites, params and depends for the global check rule.
set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES ${ARG_UNPARSED_ARGUMENTS})
set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${ARG_PARAMS})
Index: lldb/test/Shell/CMakeLists.txt
===================================================================
--- lldb/test/Shell/CMakeLists.txt
+++ lldb/test/Shell/CMakeLists.txt
@@ -21,6 +21,7 @@
"Running lldb shell test suite with reproducer capture"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-repro=capture"
+ EXCLUDE_FROM_ALL
DEPENDS lldb-test-deps)
# Add a lit test suite that runs the shell test by replaying a reproducer.
@@ -28,5 +29,6 @@
"Running lldb shell test suite with reproducer replay"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-repro=replay"
+ EXCLUDE_FROM_ALL
DEPENDS lldb-test-deps)
add_dependencies(check-lldb-repro check-lldb-repro-capture)
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
