Skip to content

Commit ad5a6c7

Browse files
committed
Fix unit tests with an extern variable
1 parent 1372c11 commit ad5a6c7

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lldb/unittests/DIL/DILTests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,8 @@ TEST_F(EvalTest, TestGlobalVariableLookup) {
11001100
EXPECT_THAT(Eval("::globalRef"), IsEqual("-559038737"));
11011101

11021102
EXPECT_THAT(Eval("externGlobalVar"),
1103-
XFail(IsEqual("12648430"))); // 0x00C0FFEE
1104-
EXPECT_THAT(Eval("::externGlobalVar"), XFail(IsEqual("12648430")));
1103+
IsEqual("12648430")); // 0x00C0FFEE
1104+
EXPECT_THAT(Eval("::externGlobalVar"), IsEqual("12648430"));
11051105

11061106
EXPECT_THAT(Eval("ns::globalVar"), IsEqual("13"));
11071107
EXPECT_THAT(Eval("ns::globalPtr"), IsOk());
@@ -1155,7 +1155,7 @@ TEST_F(EvalTest, TestAddressOf) {
11551155
EXPECT_THAT(Eval("&p != &my_pr"), IsEqual("false"));
11561156

11571157
EXPECT_THAT(Eval("&globalVar"), IsOk());
1158-
EXPECT_THAT(Eval("&externGlobalVar"), XFail(IsOk()));
1158+
EXPECT_THAT(Eval("&externGlobalVar"), IsOk());
11591159
EXPECT_THAT(Eval("&s_str"), IsOk());
11601160
EXPECT_THAT(Eval("&param"), IsOk());
11611161

lldb/unittests/DIL/Inputs/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES)
2020
add_custom_command(
2121
OUTPUT test_binary.bin
2222
COMMAND $<TARGET_FILE:clang> ${CMAKE_CURRENT_SOURCE_DIR}/test_binary.cc
23+
${CMAKE_CURRENT_SOURCE_DIR}/test_library.cc
2324
-O0 -g -std=c++17 -fuse-ld=lld -B$<TARGET_FILE:lld>
2425
-nostdlib++ -nostdinc++ -cxx-isystem ${LIBCXX_GENERATED_INCLUDE_DIR}
2526
${INCLUDE_TARGET_DIR_OPTION}
2627
-L${LIBCXX_LIBRARY_DIR} -Wl,-rpath,${LIBCXX_LIBRARY_DIR} -lc++
2728
-o ${EXE_PATH}/Inputs/test_binary.bin
28-
DEPENDS test_binary.cc clang lld
29+
DEPENDS test_binary.cc test_library.cc clang lld
2930
)
3031
add_custom_target(test_binary
3132
DEPENDS test_binary.bin

0 commit comments

Comments
 (0)