Commit 1b1b9acc authored by Johnny Chen's avatar Johnny Chen
Browse files

Marked test_process_launch_for_universal() test case as requiring 'darwin' and 'i386' 

in order to be run.  And added a default build phase at the beginning of the method.

llvm-svn: 113037
parent 7829d0e7

lldb/test/lldbtest.py

+6 −0
Original line number Diff line number Diff line
@@ -458,6 +458,12 @@ class TestBase(unittest2.TestCase): 
            # End of while loop.





    def buildDefault(self):

        """Platform specific way to build the default binaries."""

        module = __import__(sys.platform)

        if not module.buildDefault():

            raise Exception("Don't know how to build default binary")



    def buildDsym(self):

        """Platform specific way to build binaries with dsym info."""

        module = __import__(sys.platform)

lldb/test/macosx/universal/TestUniversal.py

+5 −0
Original line number Diff line number Diff line
@@ -9,9 +9,14 @@ class UniversalTestCase(TestBase): 


    mydir = "macosx/universal"



    @unittest2.skipUnless(sys.platform.startswith("darwin") and os.uname()[4]=='i386',

                          "requires Darwin & i386")

    def test_process_launch_for_universal(self):

        """Test process launch of a universal binary."""



        # Invoke the default build rule.

        self.buildDefault()



        # Note that "testit" is a universal binary.

        exe = os.path.join(os.getcwd(), "testit")

lldb/test/plugins/darwin.py

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ import lldbtest 


#print "Hello, darwin plugin!"



def buildDefault():

    lldbtest.system(["/bin/sh", "-c", "make clean; make"])



    # True signifies that we can handle building default.

    return True



def buildDsym():

    lldbtest.system(["/bin/sh", "-c", "make clean; make MAKE_DSYM=YES"])