This is an archive of the discontinued LLVM Phabricator instance.

Differential D131861

[llvm] Include utils/unittest before projects and runtimes
ClosedPublic

Authored by JDevlieghere on Aug 14 2022, 9:36 AM.

Details

Reviewers
mgorny
tstellar
Summary

Include utils/unittest before projects and runtimes so that downstream projects can check for the existence of the llvm_gtest target.

Motivated by https://reviews.llvm.org/D124314

Diff Detail

Event Timeline

JDevlieghere created this revision.Aug 14 2022, 9:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2022, 9:36 AM
JDevlieghere requested review of this revision.Aug 14 2022, 9:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2022, 9:36 AM
JDevlieghere mentioned this in D124314: lldb: Disable unittests if llvm_gtest target does not exist.Aug 14 2022, 9:38 AM
mgorny added inline comments.Aug 14 2022, 10:43 AM
llvm/CMakeLists.txt
1144

I think you meant LLVM_INCLUDE_TESTS.

Harbormaster completed remote builds in B181175: Diff 452532.Aug 14 2022, 11:02 AM
JDevlieghere updated this revision to Diff 452690.Aug 15 2022, 8:46 AM
JDevlieghere marked an inline comment as done.
JDevlieghere added inline comments.
llvm/CMakeLists.txt
1144

Indeed I did.

mgorny accepted this revision.Aug 15 2022, 9:17 AM

LGTM. Thanks!

This revision is now accepted and ready to land.Aug 15 2022, 9:17 AM
Harbormaster completed remote builds in B181297: Diff 452690.Aug 15 2022, 10:10 AM
JDevlieghere closed this revision.Aug 15 2022, 10:50 AM

350755d94d6b

Revision Contents

PathSize
llvm/
6 lines

Diff 452690

llvm/CMakeLists.txt

Show First 20 Lines • Show All 1,135 Lines • ▼ Show 20 Lines
if( LLVM_INCLUDE_UTILS ) if( LLVM_INCLUDE_UTILS )
add_subdirectory(utils/FileCheck) add_subdirectory(utils/FileCheck)
add_subdirectory(utils/PerfectShuffle) add_subdirectory(utils/PerfectShuffle)
add_subdirectory(utils/count) add_subdirectory(utils/count)
add_subdirectory(utils/not) add_subdirectory(utils/not)
add_subdirectory(utils/UnicodeData) add_subdirectory(utils/UnicodeData)
add_subdirectory(utils/yaml-bench) add_subdirectory(utils/yaml-bench)
add_subdirectory(utils/split-file) add_subdirectory(utils/split-file)
if( LLVM_INCLUDE_TESTS )
mgornyUnsubmitted
Done
ReplyInline Actions
add_subdirectory(utils/split-file)
- if( LLVM_INCLUDE_UTILS )
+ if( LLVM_INCLUDE_TESTS )
add_subdirectory(utils/unittest)

I think you meant LLVM_INCLUDE_TESTS.

mgorny: I think you meant `LLVM_INCLUDE_TESTS`.
JDevlieghereAuthorUnsubmitted
Done
ReplyInline Actions

Indeed I did.

JDevlieghere: Indeed I did.
add_subdirectory(utils/unittest)
endif()
else() else()
if ( LLVM_INCLUDE_TESTS ) if ( LLVM_INCLUDE_TESTS )
message(FATAL_ERROR "Including tests when not building utils will not work. message(FATAL_ERROR "Including tests when not building utils will not work.
Either set LLVM_INCLUDE_UTILS to On, or set LLVM_INCLUDE_TESTS to Off.") Either set LLVM_INCLUDE_UTILS to On, or set LLVM_INCLUDE_TESTS to Off.")
endif() endif()
endif() endif()
# Use LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION instead of LLVM_INCLUDE_UTILS because it is not really a util # Use LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION instead of LLVM_INCLUDE_UTILS because it is not really a util
Show All 28 Lines llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
USE_TOOLCHAIN USE_TOOLCHAIN
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
NO_INSTALL NO_INSTALL
ALWAYS_CLEAN) ALWAYS_CLEAN)
endif() endif()
add_subdirectory(utils/lit) add_subdirectory(utils/lit)
add_subdirectory(test) add_subdirectory(test)
add_subdirectory(unittests) add_subdirectory(unittests)
if( LLVM_INCLUDE_UTILS )
add_subdirectory(utils/unittest)
endif()
if (WIN32) if (WIN32)
# This utility is used to prevent crashing tests from calling Dr. Watson on # This utility is used to prevent crashing tests from calling Dr. Watson on
# Windows. # Windows.
add_subdirectory(utils/KillTheDoctor) add_subdirectory(utils/KillTheDoctor)
endif() endif()
umbrella_lit_testsuite_end(check-all) umbrella_lit_testsuite_end(check-all)
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines