maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[lldb] Use just-built libcxx for tests when available" 

This reverts commit c38eeecbc7.
This commit is contained in:
Felipe de Azevedo Piovezan 2022-09-08 14:37:46 -04:00
parent b69f10f5a1
commit 9a41f6e708
7 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
View File

@ -387,16 +387,6 @@ endif
#----------------------------------------------------------------------
# C++ standard library options
#----------------------------------------------------------------------
ifneq ($(and $(USE_LIBSTDCPP), $(USE_LIBCPP)),)
$(error Libcxx and Libstdc++ cannot be used together)
endif
ifeq (1, $(USE_SYSTEM_STDLIB))
ifneq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP)),)
$(error Cannot use system's standard library and a custom standard library together)
endif
endif
ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC)))
@ -425,15 +415,6 @@ ifeq (1,$(USE_LIBCPP))
endif
endif
# If no explicit request was made, but we have paths to a custom libcxx, use
# them.
ifeq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP), $(USE_SYSTEM_STDLIB)),)
ifneq ($(and $(LIBCPP_INCLUDE_DIR), $(LIBCPP_LIBRARY_DIR)),)
CXXFLAGS += -nostdlib++ -nostdinc++ -cxx-isystem $(LIBCPP_INCLUDE_DIR)
LDFLAGS += -L$(LLVM_LIBS_DIR) -Wl,-rpath,$(LIBCPP_LIBRARY_DIR) -lc++
endif
endif
#----------------------------------------------------------------------
# Additional system libraries
#----------------------------------------------------------------------

2
lldb/test/API/commands/expression/fixits/TestFixIts.py
View File

@ -45,7 +45,7 @@ class ExprCommandWithFixits(TestBase):
# Try with one error in a top-level expression.
# The Fix-It changes "ptr.m" to "ptr->m".
expr = "struct MyTy { int m; }; MyTy x; MyTy *ptr = &x; int m = ptr.m;"
expr = "struct X { int m; }; X x; X *ptr = &x; int m = ptr.m;"
value = frame.EvaluateExpression(expr, top_level_options)
# A successfully parsed top-level expression will yield an error
# that there is 'no value'. If a parsing error would have happened we

5
lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
View File

@ -29,3 +29,8 @@ class TestDbgInfoContentForwardList(TestBase):
self.expect_expr("std::distance(a.begin(), a.end())", result_value="3")
self.expect_expr("a.front().a", result_type="int", result_value="3")
self.expect_expr("a.begin()->a", result_type="int", result_value="3")
# FIXME: The value here isn't actually empty.
self.expect_expr("a.front()",
result_type=value_type,
result_children=[ValueCheck()])

2
lldb/test/API/lang/objc/exceptions/Makefile
View File

@ -2,7 +2,7 @@ OBJCXX_SOURCES := main.mm
CFLAGS_EXTRAS := -w
USE_SYSTEM_STDLIB := 1
LD_EXTRAS := -framework Foundation
include Makefile.rules

2
lldb/test/API/macosx/macCatalyst/Makefile
View File

@ -3,8 +3,6 @@ C_SOURCES := main.c
override TRIPLE := $(ARCH)-apple-ios13.1-macabi
CFLAGS_EXTRAS := -target $(TRIPLE)
USE_SYSTEM_STDLIB := 1
# FIXME: rdar://problem/54986190
# There is a Clang driver change missing on llvm.org.
override CC=xcrun clang

4
lldb/test/API/python_api/sbmodule/TestSBModule.py
View File

@ -47,8 +47,8 @@ class SBModuleAPICase(TestBase):
process = target.AttachToProcessWithID(self.dbg.GetListener(),
self.background_pid, error)
self.assertTrue(error.Success() and process, PROCESS_IS_VALID)
main_module = target.FindModule(lldb.SBFileSpec("a.out"))
self.assertTrue(main_module is not None)
main_module = target.GetModuleAtIndex(0)
self.assertEqual(main_module.GetFileSpec().GetFilename(), "a.out")
self.assertFalse(main_module.IsFileBacked(),
"The module should not be backed by a file on disk.")

1
lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
View File

@ -70,7 +70,6 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase):
'SDKROOT': sdkroot.strip(),
'ARCH': arch,
'ARCH_CFLAGS': '-target {} {}'.format(triple, version_min),
'USE_SYSTEM_STDLIB': 1,
})
exe_path = os.path.realpath(self.getBuildArtifact(exe_name))
cmd = [