REPOSITORY
rL LLVM
http://reviews.llvm.org/D8747
Files:
lldb/trunk/test/api/check_public_api_headers/TestPublicAPIHeaders.py
lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
lldb/trunk/test/functionalities/register/TestRegisters.py
lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
lldb/trunk/test/lang/objc/modules/TestObjCModules.py
lldb/trunk/test/terminal/TestSTTYBeforeAndAfter.py
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
Index: lldb/trunk/test/api/check_public_api_headers/TestPublicAPIHeaders.py
===================================================================
--- lldb/trunk/test/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ lldb/trunk/test/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -25,7 +25,7 @@
"""Test the SB API directory and make sure there's no unwanted stuff."""
# Only proceed if this is "darwin", "x86_64", and local platform.
- if not (sys.platform.startswith("darwin") and self.getArchitecture() == "x86_64" and not lldb.test_remote):
+ if not (self.getPlatform() == "darwin" and self.getArchitecture() == "x86_64" and not lldb.test_remote):
self.skipTest("This test is only for LLDB.framework built 64-bit and !lldb.test_remote")
if self.getArchitecture() == "i386":
self.skipTest("LLDB is 64-bit and cannot be linked to 32-bit test program.")
@@ -47,9 +47,9 @@
# for all the SB API headers.
public_headers = os.listdir(public_api_dir)
# For different platforms, the include statement can vary.
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
include_stmt = "'#include <%s>' % os.path.join('LLDB', header)"
- if sys.platform.startswith('freebsd') or sys.platform.startswith("linux") or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile':
+ if self.getPlatform() == "freebsd" or self.getPlatform() == "linux" or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile':
include_stmt = "'#include <%s>' % os.path.join(public_api_dir, header)"
list = [eval(include_stmt) for header in public_headers if (header.startswith("SB") and
header.endswith(".h"))]
Index: lldb/trunk/test/terminal/TestSTTYBeforeAndAfter.py
===================================================================
--- lldb/trunk/test/terminal/TestSTTYBeforeAndAfter.py
+++ lldb/trunk/test/terminal/TestSTTYBeforeAndAfter.py
@@ -40,7 +40,7 @@
if self.TraceOn():
child.logfile = sys.stdout
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
child.sendline('set env(TERM) xterm')
else:
child.sendline('set env(TERM) vt100')
Index: lldb/trunk/test/lang/objc/modules/TestObjCModules.py
===================================================================
--- lldb/trunk/test/lang/objc/modules/TestObjCModules.py
+++ lldb/trunk/test/lang/objc/modules/TestObjCModules.py
@@ -14,7 +14,7 @@
mydir = TestBase.compute_mydir(__file__)
- @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ @skipUnlessDarwin
@dsym_test
def test_expr_with_dsym(self):
self.buildDsym()
Index: lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
===================================================================
--- lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
+++ lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
@@ -130,7 +130,7 @@
# Sanity check the print representation of thread.
thr = str(thread)
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
tidstr = "tid = 0x%4.4x" % thread.GetThreadID()
else:
tidstr = "tid = %u" % thread.GetThreadID()
Index: lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
===================================================================
--- lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
+++ lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -28,7 +28,7 @@
def setUp(self):
TestBase.setUp(self)
- if sys.platform.startswith("freebsd") or sys.platform.startswith("linux"):
+ if self.getPlatform() == "freebsd" or self.getPlatform() == "linux":
# LD_LIBRARY_PATH must be set so the shared libraries are found on startup
if "LD_LIBRARY_PATH" in os.environ:
self.runCmd("settings set target.env-vars " + self.dylibPath + "=" + os.environ["LD_LIBRARY_PATH"] + ":" + os.getcwd())
Index: lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
===================================================================
--- lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
+++ lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
@@ -86,7 +86,7 @@
self.expect("expr string_not_empty",
substrs = ['(int (*)(const char *)) $0 = ', '(a.out`'])
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
regexps = ['lib.*\.dylib`printf']
else:
regexps = ['printf']
Index: lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
===================================================================
--- lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
+++ lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
@@ -73,7 +73,7 @@
# On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points.
# A::g_points is an array of two elements.
- if sys.platform.startswith("darwin") or sys.platform.startswith("linux"):
+ if self.getPlatform() == "darwin" or self.getPlatform() == "linux":
self.expect("target variable A::g_points[1].x", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(int) A::g_points[1].x = 11")
Index: lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
===================================================================
--- lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
+++ lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
@@ -54,7 +54,7 @@
# On Mac OS X, gcc 4.2 emits the wrong debug info with respect to types.
slist = ['(int) a = 12', 'anon_uint', 'a_uint', 'b_uint', 'y_uint']
- if sys.platform.startswith("darwin") and self.getCompiler() in ['clang', 'llvm-gcc']:
+ if self.getPlatform() == "darwin" and self.getCompiler() in ['clang', 'llvm-gcc']:
slist = ['(int) a = 12',
'::my_uint_t', 'anon_uint = 0',
'(A::uint_t) a_uint = 1',
Index: lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
===================================================================
--- lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
+++ lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
@@ -49,7 +49,7 @@
self.runCmd("run", RUN_SUCCEEDED)
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
stop_reason = 'stop reason = EXC_BAD_ACCESS'
else:
stop_reason = 'stop reason = invalid address'
@@ -73,7 +73,7 @@
self.runCmd("run", RUN_SUCCEEDED)
self.runCmd("process status")
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
stop_reason = 'EXC_BAD_ACCESS'
else:
stop_reason = 'invalid address'
Index: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
===================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
@@ -174,7 +174,7 @@
self.expect("i d symt",
patterns = ["Dumping symbol table for [0-9]+ modules."])
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
self.expect("i li",
substrs = [ 'a.out',
'/usr/lib/dyld',
Index: lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
===================================================================
--- lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
+++ lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
@@ -108,7 +108,7 @@
test_stack_depth = True
# Work around for <rdar://problem/16363195>, the darwin unwinder seems flakey about whether it duplicates the first frame
# or not, which makes counting stack depth unreliable.
- if "darwin" in sys.platform:
+ if self.getPlatform() == "darwin":
test_stack_depth = False
for step_pattern in step_sequence:
Index: lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
===================================================================
--- lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -90,7 +90,7 @@
lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
def check_stop_reason(self):
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
stop_reason = 'stop reason = EXC_BAD_ACCESS'
else:
stop_reason = 'stop reason = invalid address'
@@ -209,13 +209,13 @@
self.check_stop_reason()
expected_state = 'exited' # Provide the exit code.
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
self.expect("next",
substrs = ['Process', expected_state])
- if not(sys.platform.startswith("darwin")): # if stopped, we will have a process around
+ if self.getPlatform() != "darwin": # if stopped, we will have a process around
self.expect("thread list", error=True,substrs = ['Process must be launched'])
def recursive_inferior_crashing_expr_step_expr(self):
Index: lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
===================================================================
--- lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -87,7 +87,7 @@
lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
def check_stop_reason(self):
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
stop_reason = 'stop reason = EXC_BAD_ACCESS'
else:
stop_reason = 'stop reason = invalid address'
Index: lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
===================================================================
--- lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
+++ lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
@@ -24,7 +24,7 @@
'// Set break point at this line for test_lldb_process_load_and_unload_commands().')
self.line_d_function = line_number('d.c',
'// Find this line number within d_dunction().')
- if not sys.platform.startswith("darwin"):
+ if self.getPlatform() != "darwin":
if "LD_LIBRARY_PATH" in os.environ:
self.runCmd("settings set target.env-vars " + self.dylibPath + "=" + os.environ["LD_LIBRARY_PATH"] + ":" + os.getcwd())
else:
@@ -38,7 +38,7 @@
# Invoke the default build rule.
self.buildDefault()
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
dylibName = 'libloadunload_d.dylib'
else:
dylibName = 'libloadunload_d.so'
@@ -93,7 +93,7 @@
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
dylibName = 'libloadunload_d.dylib'
dsymName = 'libloadunload_d.dylib.dSYM'
else:
@@ -112,7 +112,7 @@
# we pick up the hidden dylib.
env_cmd_string = "settings set target.env-vars " + self.dylibPath + "=" + new_dir
- if not sys.platform.startswith("darwin"):
+ if self.getPlatform() != "darwin":
env_cmd_string += ":" + os.getcwd()
if self.TraceOn():
@@ -164,7 +164,7 @@
error=True, matching=False,
patterns = ["1 match found .* %s" % self.mydir])
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
dylibName = 'libloadunload_a.dylib'
else:
dylibName = 'libloadunload_a.so'
Index: lldb/trunk/test/functionalities/register/TestRegisters.py
===================================================================
--- lldb/trunk/test/functionalities/register/TestRegisters.py
+++ lldb/trunk/test/functionalities/register/TestRegisters.py
@@ -89,13 +89,13 @@
# platform specific logging of the specified category
def log_enable(self, category):
self.platform = ""
- if sys.platform.startswith("darwin"):
+ if self.getPlatform() == "darwin":
self.platform = "" # TODO: add support for "log enable darwin registers"
- if sys.platform.startswith("freebsd"):
+ if self.getPlatform() == "freebsd":
self.platform = "freebsd"
- if sys.platform.startswith("linux"):
+ if self.getPlatform() == "linux":
self.platform = "linux"
if self.platform != "":
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
