From 48ffd5cc6e5bb1daef34ffefbc919a05c5e1f925 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Tue, 13 Mar 2018 23:37:11 +0000 Subject: [PATCH] [test] Replace some references to Apple-internal bugs This removes around 10 references to Apple-internal radars. I've filed fresh bugs on bugs.llvm.org as appropriate for open issues. llvm-svn: 327463 --- .../api/multiple-debuggers/TestMultipleDebuggers.py | 12 ++---------- .../test/functionalities/asan/TestReportData.py | 2 +- .../TestWatchedVarHitWhenInScope.py | 4 ++-- .../test/lang/c/shared_lib/TestSharedLib.py | 2 +- .../TestSharedLibStrippedSymbols.py | 4 ++-- .../test/lang/cpp/dynamic-value/TestCppValueCast.py | 3 +-- .../lldbsuite/test/lang/cpp/printf/TestPrintf.py | 2 +- .../Python/lldbsuite/test/lang/cpp/stl/TestSTL.py | 7 +------ .../test/lang/cpp/unique-types/TestUniqueTypes.py | 4 ---- .../lang/objc/bitfield_ivars/TestBitfieldIvars.py | 6 +++--- 10 files changed, 14 insertions(+), 32 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py index d9ea974d3aba..27bd472caf99 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py +++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py @@ -18,17 +18,9 @@ class TestMultipleSimultaneousDebuggers(TestBase): mydir = TestBase.compute_mydir(__file__) + # This test case fails non-deterministically. @skipIfNoSBHeaders - @expectedFailureAll(bugnumber="rdar://30564102") - @expectedFailureAll( - archs="i[3-6]86", - bugnumber="multi-process-driver.cpp creates an x64 target") - @expectedFailureAll( - oslist=[ - "windows", - "linux", - "freebsd"], - bugnumber="llvm.org/pr20282") + @expectedFailureAll(bugnumber="llvm.org/pr20282") def test_multiple_debuggers(self): env = {self.dylibPath: self.getLLDBLibraryEnvVal()} diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py index 53f5ab9867f9..d7c511021863 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py @@ -24,7 +24,7 @@ class AsanTestReportDataCase(TestBase): @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote @skipUnlessAddressSanitizer - @expectedFailureAll(archs=['i386'], bugnumber="rdar://28658860") + @skipIf(archs=['i386'], bugnumber="llvm.org/PR36710") def test(self): self.build() self.asan_tests() diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py index e758f9cd7e2a..1a8708736ca3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py @@ -18,13 +18,13 @@ class WatchedVariableHitWhenInScopeTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - # # This test depends on not tracking watchpoint expression hits if we have # left the watchpoint scope. We will provide such an ability at some point # but the way this was done was incorrect, and it is unclear that for the # most part that's not what folks mostly want, so we have to provide a # clearer API to express this. # + # This functionality is currently unsupported on Darwin. def setUp(self): # Call super's setUp(). @@ -36,7 +36,7 @@ class WatchedVariableHitWhenInScopeTestCase(TestBase): # Test hangs due to a kernel bug, see fdfeff0f in the linux kernel for details @skipIfTargetAndroid(api_levels=list(range(25+1)), archs=["aarch64", "arm"]) - @unittest2.expectedFailure("rdar://problem/18685649") + @skipIfDarwin def test_watched_var_should_only_hit_when_in_scope(self): """Test that a variable watchpoint should only hit when in scope.""" self.build(dictionary=self.d) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py index 95993fe8e4b3..f53a19138356 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py @@ -45,7 +45,7 @@ class SharedLibTestCase(TestBase): """Test that types work when defined in a shared library and forward-declared in the main executable, but with preloading disabled""" self.common_test_expr(False) - @unittest2.expectedFailure("rdar://problem/10704639") + @unittest2.expectedFailure("llvm.org/PR36712") def test_frame_variable(self): """Test that types work when defined in a shared library and forward-declared in the main executable""" self.build() diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py index c7bc75337dbc..3731d1a1eb65 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py @@ -16,7 +16,7 @@ class SharedLibStrippedTestCase(TestBase): @expectedFailureAll(oslist=["windows"]) def test_expr(self): - """Test that types work when defined in a shared library and forward-declared in the main executable""" + """Test that types work when defined in a shared library and forwa/d-declared in the main executable""" if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion(): self.skipTest( "llvm.org/pr16214 -- clang emits partial DWARF for structures referenced via typedef") @@ -34,7 +34,7 @@ class SharedLibStrippedTestCase(TestBase): "other_element = 3"]) @expectedFailureAll(oslist=["windows"]) - @unittest2.expectedFailure("rdar://problem/10381325") + @unittest2.expectedFailure("llvm.org/PR36712") def test_frame_variable(self): """Test that types work when defined in a shared library and forward-declared in the main executable""" self.build() diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py index 276794ca4224..497f17f4454c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py @@ -19,8 +19,7 @@ class CppValueCastTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.expectedFailure( - "rdar://problem/10808472 SBValue::Cast test case is failing (virtual inheritance)") + @skipIf(bugnumber="llvm.org/PR36714") @add_test_categories(['pyapi']) def test_value_cast_with_virtual_inheritance(self): """Test SBValue::Cast(SBType) API for C++ types with virtual inheritance.""" diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py index 38ebe1a9a9c4..3dfe4f29d18c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/printf/TestPrintf.py @@ -4,4 +4,4 @@ from lldbsuite.test import decorators lldbinline.MakeInlineTest( __file__, globals(), [ decorators.expectedFailureAll( - bugnumber="rdar://problem/24599697")]) + bugnumber="llvm.org/PR36715")]) diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py index afaf9d1a0761..42c372489c63 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py @@ -26,7 +26,7 @@ class STLTestCase(TestBase): self.line = line_number( self.source, '// Set break point at this line.') - @expectedFailureAll(bugnumber="rdar://problem/10400981") + @expectedFailureAll(bugnumber="llvm.org/PR36713") def test(self): """Test some expressions involving STL data types.""" self.build() @@ -38,9 +38,6 @@ class STLTestCase(TestBase): self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) - # rdar://problem/8543077 - # test/stl: clang built binaries results in the breakpoint locations = 3, - # is this a problem with clang generated debug info? lldbutil.run_break_set_by_file_and_line( self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True) @@ -60,8 +57,6 @@ class STLTestCase(TestBase): self.runCmd( 'expr for (int i = 0; i < hello_world.length(); ++i) { (void)printf("%c\\n", hello_world[i]); }') - # rdar://problem/10373783 - # rdar://problem/10400981 self.expect('expr associative_array.size()', substrs=[' = 3']) self.expect('expr associative_array.count(hello_world)', diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py index 1f9e17ff4767..3e4fee0b49bc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py @@ -28,10 +28,6 @@ class UniqueTypesTestCase(TestBase): compiler = self.getCompiler() compiler_basename = os.path.basename(compiler) - if "clang" in compiler_basename and int( - self.getCompilerVersion().split('.')[0]) < 3: - self.skipTest( - "rdar://problem/9173060 lldb hangs while running unique-types for clang version < 3") exe = self.getBuildArtifact("a.out") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py index 4a3311fb5f6d..c7d12895a421 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/bitfield_ivars/TestBitfieldIvars.py @@ -5,8 +5,8 @@ lldbinline.MakeInlineTest( __file__, globals(), [ - decorators.skipIfFreeBSD, - decorators.skipIfLinux, - decorators.skipIfWindows, + # This is a Darwin-only failure related to incorrect expresssion- + # evaluation for single-bit ObjC bitfields. + decorators.skipUnlessDarwin, decorators.expectedFailureAll( bugnumber="rdar://problem/17990991")])