From 3ff8e96cf7f8e1b153b4a201fa35ca8ec54b42b2 Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnny.chen@apple.com>
Date: Thu, 27 Jan 2011 02:58:54 +0000
Subject: [PATCH] Some cleanup to plugins/darwin.py after the recent additions
 of '-A arch' and '-C compiler' command line options to the test driver. 
 Replace TestBase.getRunSpec() with TestBase.getRunOptions().

llvm-svn: 124353
---
 lldb/test/lldbtest.py       | 21 ++++++++++++++++-----
 lldb/test/plugins/darwin.py |  9 ++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 032ca73a0f89..fa8ab5720e79 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -625,7 +625,7 @@ class TestBase(unittest2.TestCase):
             print >> f, "Session info generated @", datetime.datetime.now().ctime()
             print >> f, self.session.getvalue()
             print >> f, "To rerun this test, issue the following command from the 'test' directory:\n"
-            print >> f, "%s ./dotest.py -v -t -f %s.%s" % (self.getRunSpec(),
+            print >> f, "./dotest.py %s -v -t -f %s.%s" % (self.getRunOptions(),
                                                            self.__class__.__name__,
                                                            self._testMethodName)
 
@@ -855,16 +855,27 @@ class TestBase(unittest2.TestCase):
             # End of while loop.
 
 
+    def getArchitecture(self):
+        """Returns the architecture in effect the test suite is now running with."""
+        module = __import__(sys.platform)
+        return module.getArchitecture()
+
     def getCompiler(self):
         """Returns the compiler in effect the test suite is now running with."""
         module = __import__(sys.platform)
         return module.getCompiler()
 
-    def getRunSpec(self):
-        """Environment variable spec to run this test again, invoked from within
-        dumpSessionInfo()."""
+    def getRunOptions(self):
+        """Command line option for -A and -C to run this test again, called from
+        within dumpSessionInfo()."""
         module = __import__(sys.platform)
-        return module.getRunSpec()
+        arch = self.getArchitecture()
+        comp = self.getCompiler()
+        if not arch and not comp:
+            return ""
+        else:
+            return "%s %s" % ("-A "+arch if arch else "",
+                              "-C "+comp if comp else "")
 
     def buildDefault(self, architecture=None, compiler=None, dictionary=None):
         """Platform specific way to build the default binaries."""
diff --git a/lldb/test/plugins/darwin.py b/lldb/test/plugins/darwin.py
index bdb1b11d4b71..020fbb983e25 100644
--- a/lldb/test/plugins/darwin.py
+++ b/lldb/test/plugins/darwin.py
@@ -17,15 +17,14 @@ import lldbtest
 
 #print "Hello, darwin plugin!"
 
+def getArchitecture():
+    """Returns the architecture in effect the test suite is now running with."""
+    return os.environ["ARCH"] if "ARCH" in os.environ else ""
+
 def getCompiler():
     """Returns the compiler in effect the test suite is now running with."""
     return os.environ["CC"] if "CC" in os.environ else ""
 
-def getRunSpec():
-    """Environment variable spec to run this test again, invoked from within
-    dumpSessionInfo()."""
-    return "%s%s" % (getArchSpec(None), getCCSpec(None))
-
 def getArchSpec(architecture):
     """
     Helper function to return the key-value string to specify the architecture