diff options
Diffstat (limited to 'packages/Python/lldbsuite/test/settings')
| -rw-r--r-- | packages/Python/lldbsuite/test/settings/TestSettings.py | 12 | ||||
| -rw-r--r-- | packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py | 19 |
2 files changed, 20 insertions, 11 deletions
diff --git a/packages/Python/lldbsuite/test/settings/TestSettings.py b/packages/Python/lldbsuite/test/settings/TestSettings.py index 1d1912495551c..9592fa9d6dfb7 100644 --- a/packages/Python/lldbsuite/test/settings/TestSettings.py +++ b/packages/Python/lldbsuite/test/settings/TestSettings.py @@ -8,7 +8,9 @@ from __future__ import print_function import os, time, re import lldb +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil class SettingsCommandTestCase(TestBase): @@ -174,7 +176,7 @@ class SettingsCommandTestCase(TestBase): self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"), startstr = "auto-confirm (boolean) = false") - @skipUnlessArch(['x86_64', 'i386', 'i686']) + @skipIf(archs=no_match(['x86_64', 'i386', 'i686'])) def test_disassembler_settings(self): """Test that user options for the disassembler take effect.""" self.build() @@ -208,7 +210,6 @@ class SettingsCommandTestCase(TestBase): self.expect("disassemble -n numberfn", substrs = ["5ah"]) - @expectedFailureWindows("llvm.org/pr24579") def test_run_args_and_env_vars(self): """Test that run-args and env-vars are passed to the launched process.""" self.build() @@ -311,8 +312,11 @@ class SettingsCommandTestCase(TestBase): with open('stderr.txt', 'r') as f: output = f.read() - self.expect(output, exe=False, - startstr = "This message should go to standard error.") + message = "This message should go to standard error." + if lldbplatformutil.hasChattyStderr(self): + self.expect(output, exe=False, substrs = [message]) + else: + self.expect(output, exe=False, startstr = message) # The 'stdout.txt' file should now exist. self.assertTrue(os.path.isfile("stdout.txt"), diff --git a/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py b/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py index 878fc8a506757..67c535d649fde 100644 --- a/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py +++ b/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py @@ -6,9 +6,14 @@ from __future__ import print_function -import os, time, re +import os +import re +import time + import lldb +from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil class SettingsCommandTestCase(TestBase): @@ -23,7 +28,7 @@ class SettingsCommandTestCase(TestBase): def test_no_quote(self): self.do_test_args("a b c", "a\0b\0c\0") - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_single_quote(self): self.do_test_args("'a b c'", "a b c\0") @@ -32,17 +37,17 @@ class SettingsCommandTestCase(TestBase): def test_double_quote(self): self.do_test_args('"a b c"', "a b c\0") - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_single_quote_escape(self): self.do_test_args("'a b\\' c", "a b\\\0c\0") - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_double_quote_escape(self): self.do_test_args('"a b\\" c"', 'a b" c\0') - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_double_quote_escape2(self): self.do_test_args('"a b\\\\" c', 'a b\\\0c\0') @@ -51,7 +56,7 @@ class SettingsCommandTestCase(TestBase): def test_single_in_double(self): self.do_test_args('"a\'b"', "a'b\0") - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_double_in_single(self): self.do_test_args("'a\"b'", 'a"b\0') @@ -64,7 +69,7 @@ class SettingsCommandTestCase(TestBase): def test_bare_single(self): self.do_test_args("a\\'b", "a'b\0") - @expectedFailureWindows("http://llvm.org/pr24557") + @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24557") @no_debug_info_test def test_bare_double(self): self.do_test_args('a\\"b', 'a"b\0') |