[Lldb-commits] [lldb] r155083 - in /lldb/branches/lldb-platform-work/test: api/check_public_api_headers/TestPublicAPIHeaders.py dotest.py

[Johnny Chen]

Author: johnny
Date: Wed Apr 18 19:37:33 2012
New Revision: 155083

URL: http://llvm.org/viewvc/llvm-project?rev=155083&view=rev
Log:
Make TestPublicAPIHeaders.py only valid if all the following conditions hold:

o sys.platform.startswith("darwin")
o self.getArchitecture() == "x86_64"
o not lldb.test_remote

Modified:
    lldb/branches/lldb-platform-work/test/api/check_public_api_headers/TestPublicAPIHeaders.py
    lldb/branches/lldb-platform-work/test/dotest.py

Modified: lldb/branches/lldb-platform-work/test/api/check_public_api_headers/TestPublicAPIHeaders.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/api/check_public_api_headers/TestPublicAPIHeaders.py?rev=155083&r1=155082&r2=155083&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/api/check_public_api_headers/TestPublicAPIHeaders.py (original)
+++ lldb/branches/lldb-platform-work/test/api/check_public_api_headers/TestPublicAPIHeaders.py Wed Apr 18 19:37:33 2012
@@ -20,8 +20,9 @@
     def test_sb_api_directory(self):
         """Test the SB API directory and make sure there's no unwanted stuff."""
 
-        if sys.platform.startswith("darwin") and self.getArchitecture() == "i386":
-            self.skipTest("LLDB.framework built 64-bit")
+        # 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):
+            self.skipTest("This test is only for LLDB.framework built 64-bit and !lldb.test_remote")
 
         # Call the program generator to produce main.cpp.
         self.generate_main_cpp()

Modified: lldb/branches/lldb-platform-work/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/dotest.py?rev=155083&r1=155082&r2=155083&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/dotest.py (original)
+++ lldb/branches/lldb-platform-work/test/dotest.py Wed Apr 18 19:37:33 2012
@@ -1055,6 +1055,12 @@
 print "lldb.pre_flight:", getsource_if_available(lldb.pre_flight)
 print "lldb.post_flight:", getsource_if_available(lldb.post_flight)
 
+# If either pre_flight or post_flight is defined, set lldb.test_remote to True.
+if lldb.pre_flight or lldb.post_flight:
+    lldb.test_remote = True
+else:
+    lldb.test_remote = False
+
 # So does the lldbtest_remote_sandbox variable.
 lldb.lldbtest_remote_sandbox = lldbtest_remote_sandbox