RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-14 07:09:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r159588, and apply a more principled fix. Place the fix for this

Browse Source 
in the abstraction for lit test suites so that the various other layers
of abstraction pick up the same behavioral fix, and so that we still get
a complete list of dependencies for the 'check-all' target.

This should fix the follow-on issues of the same nature with various
other build targets, including Clang targets. Sorry for the churn, and
again thanks to Matt for testing and breaking this more thoroughly.

llvm-svn: 159593
This commit is contained in:
Chandler Carruth 2012-07-02 21:31:03 +00:00
parent 6be444ca57
commit 5be5cafa65
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/modules/AddLLVM.cmake
View File

@ -270,8 +270,13 @@ function(add_lit_target target comment)
add_custom_target(${target}
COMMAND ${LIT_COMMAND} ${ARG_DEFAULT_ARGS}
COMMENT "${comment}"
DEPENDS ${ARG_DEPENDS}
)
# It would be nice to use the DEPENDS clause in add_custom_target above, but
# that has bugs with the CMake 2.8.0 installed on Ubuntu Lucid when the entry
# in the depends is another custom target. Instead we add them through an
# explicit add_dependencies.
add_dependencies(${target} ${ARG_DEPENDS})
endfunction()
# A function to add a set of lit test suites to be driven through 'check-*' targets.

6
test/CMakeLists.txt
View File

@ -11,16 +11,14 @@ add_lit_testsuite(check-llvm "Running the LLVM regression tests"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
DEPENDS BugpointPasses LLVMHello
DEPENDS UnitTests
BugpointPasses LLVMHello
llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump
llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj
macho-dump opt
FileCheck count not
)
set_target_properties(check-llvm PROPERTIES FOLDER "Tests")
# Note, this is kept here rather than in the DEPENDS above because of bugs in
# some CMake versions that mishandle the dependency otherwise.
add_dependencies(check-llvm UnitTests)
# Setup a legacy alias for 'check-llvm'. This will likely change to be an
# alias for 'check-all' at some point in the future.