Index: lldb/trunk/packages/Python/lldbsuite/test/decorators.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/decorators.py +++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py @@ -300,9 +300,6 @@ # For legacy reasons, we support both "darwin" and "macosx" as OS X triples. return expectedFailureOS(lldbplatform.darwin_all, bugnumber, compilers, debug_info=debug_info) -def expectedFailureFreeBSD(bugnumber=None, compilers=None, debug_info=None): - return expectedFailureOS(lldbplatform.freebsd, bugnumber, compilers, debug_info=debug_info) - def expectedFailureAndroid(bugnumber=None, api_levels=None, archs=None): """ Mark a test as xfail for Android. Index: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py +++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py @@ -23,7 +23,7 @@ '// Please test these expressions while stopped at this line:') @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr14437, fails with ICC 13.1") - @expectedFailureFreeBSD('llvm.org/pr17807') # Fails on FreeBSD buildbot + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr17807 Fails on FreeBSD buildbot') @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765") def test_with(self): """Test calling std::String member function.""" Index: lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py +++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py @@ -23,8 +23,7 @@ '// Stop here') @skipIfFreeBSD # llvm.org/pr24691 skipping to avoid crashing the test runner - @expectedFailureFreeBSD('llvm.org/pr19011') # Newer Clang omits C1 complete object constructor - @expectedFailureFreeBSD('llvm.org/pr24691') # we hit an assertion in clang + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr19011 Newer Clang omits C1 complete object constructor') @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765") @skipIfTargetAndroid() # skipping to avoid crashing the test runner @expectedFailureAndroid('llvm.org/pr24691') # we hit an assertion in clang Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py @@ -19,7 +19,7 @@ mydir = TestBase.compute_mydir(__file__) @skipIfRemote - @expectedFailureFreeBSD('llvm.org/pr19310') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr19310') @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778") def test_attach_continue_interrupt_detach(self): """Test attach/continue/interrupt/detach""" Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py @@ -25,14 +25,14 @@ mydir = TestBase.compute_mydir(__file__) @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376") - @expectedFailureFreeBSD("llvm.org/pr25624 still failing with Python 2.7.10") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10") @skipIfWindows # The check for descriptor leakage needs to be implemented differently here. @skipIfTargetAndroid() # Android have some other file descriptors open by the shell def test_fd_leak_basic (self): self.do_test([]) @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376") - @expectedFailureFreeBSD("llvm.org/pr25624 still failing with Python 2.7.10") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10") @skipIfWindows # The check for descriptor leakage needs to be implemented differently here. @skipIfTargetAndroid() # Android have some other file descriptors open by the shell def test_fd_leak_log (self): @@ -55,7 +55,7 @@ "Process returned non-zero status. Were incorrect file descriptors passed?") @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376") - @expectedFailureFreeBSD("llvm.org/pr25624 still failing with Python 2.7.10") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10") @expectedFlakeyLinux @skipIfWindows # The check for descriptor leakage needs to be implemented differently here. @skipIfTargetAndroid() # Android have some other file descriptors open by the shell Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -16,7 +16,7 @@ mydir = TestBase.compute_mydir(__file__) - @expectedFailureFreeBSD("llvm.org/pr20548") # fails to build on lab.llvm.org buildbot + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr20548 fails to build on lab.llvm.org buildbot") @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462, Data formatters have problems on Windows") def test_with_run_command(self): """Test data formatter commands.""" Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -22,7 +22,7 @@ # Find the line number to break at. self.line = line_number('main.cpp', '// Set break point at this line.') - @expectedFailureFreeBSD("llvm.org/pr20548") # fails to build on lab.llvm.org buildbot + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr20548 fails to build on lab.llvm.org buildbot') @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers") @skipIfWindows # libstdcpp not ported to Windows. @skipIfDarwin Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py @@ -20,7 +20,7 @@ mydir = TestBase.compute_mydir(__file__) - @expectedFailureFreeBSD('llvm.org/pr17946') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr17946') @expectedFlakeyLinux # failed 1/365 test runs, line 61, thread.IsValid() @expectedFailureAll(oslist=["windows"], bugnumber="Windows doesn't have pthreads, test needs to be ported") def test_with_run_command(self): Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -15,7 +15,7 @@ mydir = TestBase.compute_mydir(__file__) - @expectedFailureFreeBSD("llvm.org/pr23699 SIGSEGV is reported as exception, not signal") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal") @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API") def test_inferior_crashing(self): """Test that lldb reliably catches the inferior crashing (command).""" @@ -47,7 +47,7 @@ self.build() self.inferior_crashing_step() - @expectedFailureFreeBSD('llvm.org/pr24939') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939') @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API") @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer def test_inferior_crashing_step_after_break(self): Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -15,7 +15,7 @@ mydir = TestBase.compute_mydir(__file__) - @expectedFailureFreeBSD("llvm.org/pr23699 SIGSEGV is reported as exception, not signal") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal") @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778") def test_recursive_inferior_crashing(self): """Test that lldb reliably catches the inferior crashing (command).""" @@ -47,7 +47,7 @@ self.build() self.recursive_inferior_crashing_step() - @expectedFailureFreeBSD('llvm.org/pr24939') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939') @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778") @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer def test_recursive_inferior_crashing_step_after_break(self): Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py @@ -21,7 +21,7 @@ # Find the line number to break inside main(). self.line = line_number('main.c', 'Put breakpoint here') - @expectedFailureFreeBSD("llvm.org/pr23318: does not report running state") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23318: does not report running state") @skipIfWindows # Windows does not support signals def test_with_run_command(self): """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process.""" Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py @@ -19,7 +19,7 @@ @skipIfWindows # signals do not exist on Windows @skipIfDarwin - @expectedFailureFreeBSD("llvm.org/pr23699 SIGSEGV is reported as exception, not signal") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal") def test_inferior_handle_sigsegv(self): self.build() exe = os.path.join(os.getcwd(), "a.out") Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py @@ -19,7 +19,7 @@ mydir = TestBase.compute_mydir(__file__) @skipIfFreeBSD # test frequently times out or hangs - @expectedFailureFreeBSD('llvm.org/pr18522') # hits break in another thread in testrun + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr18522') # hits break in another thread in testrun @add_test_categories(['pyapi']) @expectedFlakeyLinux # this test fails 6/100 dosep runs def test_python(self): Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py @@ -24,7 +24,7 @@ self.main_source = "main.c" @add_test_categories(['pyapi']) - @expectedFailureFreeBSD('llvm.org/pr17932') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr17932') @expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr14437") @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24777") def test_and_python_api(self): Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py @@ -51,7 +51,7 @@ @expectedFailureDarwin(9980907) @expectedFailureAll(compiler=["clang", "gcc"], bugnumber="Compiler emits incomplete debug info") - @expectedFailureFreeBSD('llvm.org/pr20550 failing on FreeBSD-11') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr20550 failing on FreeBSD-11') @add_test_categories(['pyapi']) def test_with_python_api(self): """Test Python APIs on file and class static variables.""" Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @expectedFailureFreeBSD("llvm.org/pr25925") + @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25925") @expectedFailureAll(compiler="gcc", compiler_version=[">", "4.9"]) def test_with_run_command(self): """Tests imported namespaces in C++.""" Index: lldb/trunk/packages/Python/lldbsuite/test/lang/go/runtime/TestGoLanguageRuntime =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/go/runtime/TestGoLanguageRuntime +++ lldb/trunk/packages/Python/lldbsuite/test/lang/go/runtime/TestGoLanguageRuntime @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) @python_api_test - @expectedFailureFreeBSD('llvm.org/pr24895') + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24895') @skipIfRemote # Not remote test suite ready @skipUnlessGoInstalled def test_with_dsym_and_python_api(self): Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py @@ -39,7 +39,7 @@ self.run_to_address(self.exe_name) @add_test_categories(['pyapi']) - @expectedFailureFreeBSD # llvm.org/pr20476 + @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr20476') @expectedFailureAll(oslist=["windows"]) def test_step_out_of_malloc_into_function_b(self): """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b().""" Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py @@ -49,7 +49,7 @@ @llgs_test @skipIfRemote # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target - @expectedFailureFreeBSD() + @expectedFailureAll(oslist=['freebsd']) def test_sid_is_same_without_setsid_llgs(self): self.init_llgs_test() self.set_inferior_startup_launch()