From 14fb31795a4bd25798bc2788dd4d4e38e3ea41c7 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Wed, 19 Feb 2020 20:19:08 -0800 Subject: [PATCH] [lldb/Test] s/skipIfDarwinEmbedded/skipIfRemote/ in VSCode tests. As pointed out on lldb-commits this skipIfRemote is the better fit for the decorator. --- .../tools/lldb-vscode/attach/TestVSCode_attach.py | 4 ++-- .../breakpoint/TestVSCode_setBreakpoints.py | 4 ++-- .../TestVSCode_setExceptionBreakpoints.py | 2 +- .../TestVSCode_setFunctionBreakpoints.py | 4 ++-- .../tools/lldb-vscode/launch/TestVSCode_launch.py | 24 +++++++++++----------- .../stackTrace/TestVSCode_stackTrace.py | 2 +- .../API/tools/lldb-vscode/step/TestVSCode_step.py | 2 +- .../lldb-vscode/variables/TestVSCode_variables.py | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py b/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py index c2fc20a..9d9553f 100644 --- a/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py +++ b/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py @@ -46,7 +46,7 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase): @skipIfWindows @skipIfNetBSD # Hangs on NetBSD as well - @skipIfDarwinEmbedded + @skipIfRemote def test_by_pid(self): ''' Tests attaching to a process by process ID. @@ -62,7 +62,7 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase): @skipIfWindows @skipIfNetBSD # Hangs on NetBSD as well - @skipIfDarwinEmbedded + @skipIfRemote def test_by_name(self): ''' Tests attaching to a process by process name. diff --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py index ad345a90..aff210d 100644 --- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py +++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py @@ -17,7 +17,7 @@ class TestVSCode_setBreakpoints(lldbvscode_testcase.VSCodeTestCaseBase): mydir = TestBase.compute_mydir(__file__) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_set_and_clear(self): '''Tests setting and clearing source file and line breakpoints. This packet is a bit tricky on the debug adaptor side since there @@ -149,7 +149,7 @@ class TestVSCode_setBreakpoints(lldbvscode_testcase.VSCodeTestCaseBase): "expect breakpoint still verified") @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_functionality(self): '''Tests hitting breakpoints and the functionality of a single breakpoint, like 'conditions' and 'hitCondition' settings.''' diff --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py index bc32955..36c0cfe 100644 --- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py +++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py @@ -18,7 +18,7 @@ class TestVSCode_setExceptionBreakpoints( @skipIfWindows @expectedFailureNetBSD - @skipIfDarwinEmbedded + @skipIfRemote def test_functionality(self): '''Tests setting and clearing exception breakpoints. This packet is a bit tricky on the debug adaptor side since there diff --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py index 84abe92..306c1ce 100644 --- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py +++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py @@ -17,7 +17,7 @@ class TestVSCode_setFunctionBreakpoints( mydir = TestBase.compute_mydir(__file__) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_set_and_clear(self): '''Tests setting and clearing function breakpoints. This packet is a bit tricky on the debug adaptor side since there @@ -108,7 +108,7 @@ class TestVSCode_setFunctionBreakpoints( "expect %u source breakpoints" % (len(functions))) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_functionality(self): '''Tests hitting breakpoints and the functionality of a single breakpoint, like 'conditions' and 'hitCondition' settings.''' diff --git a/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py b/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py index f56283a..b63170e 100644 --- a/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py +++ b/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py @@ -18,7 +18,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): @skipIfWindows @skipIfDarwin # Flaky - @skipIfDarwinEmbedded + @skipIfRemote def test_default(self): ''' Tests the default launch of a simple program. No arguments, @@ -36,7 +36,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): "make sure program path is in first argument") @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_stopOnEntry(self): ''' Tests the default launch of a simple program that stops at the @@ -56,7 +56,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): 'verify stop isn\'t "main" breakpoint') @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_cwd(self): ''' Tests the default launch of a simple program with a current working @@ -84,7 +84,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): self.assertTrue(found, "verified program working directory") @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_debuggerRoot(self): ''' Tests the "debuggerRoot" will change the working directory of @@ -113,7 +113,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): self.continue_to_exit() @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_sourcePath(self): ''' Tests the "sourcePath" will set the target.source-map. @@ -139,7 +139,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): self.continue_to_exit() @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_disableSTDIO(self): ''' Tests the default launch of a simple program with STDIO disabled. @@ -156,7 +156,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): @skipIfWindows @skipIfLinux # shell argument expansion doesn't seem to work on Linux @expectedFailureNetBSD - @skipIfDarwinEmbedded + @skipIfRemote def test_shellExpandArguments_enabled(self): ''' Tests the default launch of a simple program with shell expansion @@ -180,7 +180,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): glob, program)) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_shellExpandArguments_disabled(self): ''' Tests the default launch of a simple program with shell expansion @@ -206,7 +206,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): glob, glob)) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_args(self): ''' Tests launch of a simple program with arguments @@ -232,7 +232,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): 'arg[%i] "%s" not in "%s"' % (i+1, quoted_arg, lines[i])) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_environment(self): ''' Tests launch of a simple program with environment variables @@ -265,7 +265,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): var, lines)) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_commands(self): ''' Tests the "initCommands", "preRunCommands", "stopCommands" and @@ -332,7 +332,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase): self.verify_commands('exitCommands', output, exitCommands) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_extra_launch_commands(self): ''' Tests the "luanchCommands" with extra launching settings diff --git a/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py b/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py index 62d5063..9c01577 100644 --- a/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py +++ b/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py @@ -52,7 +52,7 @@ class TestVSCode_stackTrace(lldbvscode_testcase.VSCodeTestCaseBase): expected_line)) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_stackTrace(self): ''' Tests the 'stackTrace' packet and all its variants. diff --git a/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py b/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py index 0ef5ef7..dbe3cde 100644 --- a/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py +++ b/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py @@ -16,7 +16,7 @@ class TestVSCode_step(lldbvscode_testcase.VSCodeTestCaseBase): mydir = TestBase.compute_mydir(__file__) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_step(self): ''' Tests the stepping in/out/over in threads. diff --git a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py index b5cf253..2acd3e7 100644 --- a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py +++ b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py @@ -74,7 +74,7 @@ class TestVSCode_variables(lldbvscode_testcase.VSCodeTestCaseBase): self.verify_values(verify_dict[name], variable, varref_dict) @skipIfWindows - @skipIfDarwinEmbedded + @skipIfRemote def test_scopes_variables_setVariable_evaluate(self): ''' Tests the "scopes", "variables", "setVariable", and "evaluate" -- 2.7.4