[Lldb-commits] [PATCH] Check before using platform specific attributes.

[Zachary Turner]

Looks good
On Thu, Jun 4, 2015 at 10:43 PM Chaoren Lin <chaorenl at google.com> wrote:

> Formatting.
>
>
> http://reviews.llvm.org/D10202
>
> Files:
>   test/functionalities/tty/TestTerminal.py
>   test/macosx/universal/TestUniversal.py
>
> Index: test/functionalities/tty/TestTerminal.py
> ===================================================================
> --- test/functionalities/tty/TestTerminal.py
> +++ test/functionalities/tty/TestTerminal.py
> @@ -20,7 +20,8 @@
>
>      # 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
> Index: test/macosx/universal/TestUniversal.py
> ===================================================================
> --- test/macosx/universal/TestUniversal.py
> +++ test/macosx/universal/TestUniversal.py
> @@ -18,7 +18,8 @@
>
>      @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 @@
>          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
>
> EMAIL PREFERENCES
>   http://reviews.llvm.org/settings/panel/emailpreferences/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150605/912559e2/attachment.html>