From 52cf8ecc2321653737b8350ba1a8d230f609cf59 Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Fri, 5 Jun 2015 06:28:43 +0000 Subject: [PATCH] Check before using platform specific attributes. Summary: `os.uname` in TestUniversal and `os.geteuid` in TestTerminal. Reviewers: clayborg, zturner Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10202 llvm-svn: 239135 --- lldb/test/functionalities/tty/TestTerminal.py | 3 ++- lldb/test/macosx/universal/TestUniversal.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lldb/test/functionalities/tty/TestTerminal.py b/lldb/test/functionalities/tty/TestTerminal.py index e883056..8777756 100644 --- a/lldb/test/functionalities/tty/TestTerminal.py +++ b/lldb/test/functionalities/tty/TestTerminal.py @@ -20,7 +20,8 @@ class LaunchInTerminalTestCase(TestBase): # If the test is being run under sudo, the spawned terminal won't retain that elevated # privilege so it can't open the socket to talk back to the test case - @unittest2.skipUnless(os.geteuid() != 0, "test cannot be run as root") + @unittest2.skipUnless(not hasattr(os, 'geteuid') or os.geteuid() != 0, + "test cannot be run as root") # Do we need to disable this test if the testsuite is being run on a remote system? # This env var is only defined when the shell is running in a local mac terminal window diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py index f72b5747..9f79936 100644 --- a/lldb/test/macosx/universal/TestUniversal.py +++ b/lldb/test/macosx/universal/TestUniversal.py @@ -18,7 +18,8 @@ class UniversalTestCase(TestBase): @python_api_test @skipUnlessDarwin - @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64") + @unittest2.skipUnless(hasattr(os, "uname") and os.uname()[4] in ['i386', 'x86_64'], + "requires i386 or x86_64") def test_sbdebugger_create_target_with_file_and_target_triple(self): """Test the SBDebugger.CreateTargetWithFileAndTargetTriple() API.""" # Invoke the default build rule. @@ -36,7 +37,8 @@ class UniversalTestCase(TestBase): self.assertTrue(process, PROCESS_IS_VALID) @skipUnlessDarwin - @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64") + @unittest2.skipUnless(hasattr(os, "uname") and os.uname()[4] in ['i386', 'x86_64'], + "requires i386 or x86_64") def test_process_launch_for_universal(self): """Test process launch of a universal binary.""" from lldbutil import print_registers -- 2.7.4