This is an archive of the discontinued LLVM Phabricator instance.

Differential D138562

[flang] Fix unittests in standalone build for third-party move
ClosedPublic

Authored by mgorny on Nov 23 2022, 4:22 AM.

Details

Reviewers
sameeranjoshi
awarzynski
stellaraccident
tstellar
MaskRay
thesamesam
Commits
rG58d1988b19a7: [flang] Fix unittests in standalone build for third-party move
Summary

Update external unittest rules for flang standalone builds to account
for the unittest components (gtest, gmock) being moved to third-party
directory, in a11cd0d94ed3cabf0998a0289aead05da94c86eb.

Diff Detail

Event Timeline

mgorny created this revision.Nov 23 2022, 4:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 23 2022, 4:22 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
mgorny requested review of this revision.Nov 23 2022, 4:22 AM
Harbormaster completed remote builds in B199167: Diff 477451.Nov 23 2022, 4:41 AM
awarzynski accepted this revision.Nov 23 2022, 5:08 AM

Makes sense, thanks for the clean-up! LGTM

This revision is now accepted and ready to land.Nov 23 2022, 5:08 AM
Closed by commit rG58d1988b19a7: [flang] Fix unittests in standalone build for third-party move (authored by mgorny). · Explain WhyNov 23 2022, 6:13 AM
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rG58d1988b19a7: [flang] Fix unittests in standalone build for third-party move.
Herald added a project: Restricted Project. · View Herald TranscriptNov 23 2022, 6:13 AM
mgorny added a comment.Nov 23 2022, 6:13 AM

Thanks!

Herald added a subscriber: jdoerfert. · View Herald TranscriptNov 23 2022, 6:13 AM

Revision Contents

PathSize
flang/
3 lines

Diff 477451

flang/CMakeLists.txt

Show First 20 Lines • Show All 142 Lines • ▼ Show 20 Linesif (FLANG_STANDALONE_BUILD)
option(FLANG_INCLUDE_TESTS option(FLANG_INCLUDE_TESTS
"Generate build targets for the Flang unit tests." "Generate build targets for the Flang unit tests."
ON) ON)
get_errc_messages(LLVM_LIT_ERRC_MESSAGES) get_errc_messages(LLVM_LIT_ERRC_MESSAGES)
#Handle unittests when out-of-tree #Handle unittests when out-of-tree
#LLVM_BUILD_MAIN_SRC_DIR - Path to llvm source when out-of-tree.
set(FLANG_GTEST_AVAIL 0) set(FLANG_GTEST_AVAIL 0)
if (FLANG_INCLUDE_TESTS) if (FLANG_INCLUDE_TESTS)
set(UNITTEST_DIR ${LLVM_BUILD_MAIN_SRC_DIR}/utils/unittest) set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
if (NOT TARGET llvm_gtest) if (NOT TARGET llvm_gtest)
add_library(llvm_gtest add_library(llvm_gtest
${UNITTEST_DIR}/googletest/src/gtest-all.cc ${UNITTEST_DIR}/googletest/src/gtest-all.cc
${UNITTEST_DIR}/googlemock/src/gmock-all.cc ${UNITTEST_DIR}/googlemock/src/gmock-all.cc
) )
target_include_directories(llvm_gtest target_include_directories(llvm_gtest
PUBLIC PUBLIC
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines