[Lldb-commits] [lldb] r247090 - Reverting r247000 since it's causing TestRegisters.test_fp_special_purpose_register_read to fail on OSX.

[Oleksiy Vyalov via lldb-commits]

Author: ovyalov
Date: Tue Sep  8 17:41:13 2015
New Revision: 247090

URL: http://llvm.org/viewvc/llvm-project?rev=247090&view=rev
Log:
Reverting r247000 since it's causing TestRegisters.test_fp_special_purpose_register_read to fail on OSX.


Modified:
    lldb/trunk/test/functionalities/register/TestRegisters.py
    lldb/trunk/test/functionalities/register/a.cpp

Modified: lldb/trunk/test/functionalities/register/TestRegisters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/register/TestRegisters.py?rev=247090&r1=247089&r2=247090&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/register/TestRegisters.py (original)
+++ lldb/trunk/test/functionalities/register/TestRegisters.py Tue Sep  8 17:41:13 2015
@@ -37,6 +37,7 @@ class RegisterCommandsTestCase(TestBase)
         self.fp_register_write()
 
     @expectedFailureAndroid(archs=["i386"]) # "register read fstat" always return 0xffff
+    @expectedFailureClang("llvm.org/pr24733")
     def test_fp_special_purpose_register_read(self):
         """Test commands that read fpu special purpose registers."""
         if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']:
@@ -168,14 +169,15 @@ class RegisterCommandsTestCase(TestBase)
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
 
+        # Find the line number to break inside a.cpp.
+        self.line = line_number('a.cpp', '// Set break point at this line.')
+
+        # Set breakpoint
+        lldbutil.run_break_set_by_file_and_line (self, "a.cpp", self.line, num_expected_locations=1, loc_exact=True)
+
         # Launch the process, and do not stop at the entry point.
         self.runCmd ("run", RUN_SUCCEEDED)
 
-        # Check stop reason; Should be SIGTRAP
-        stop_reason = 'stop reason = signal SIGTRAP'
-        self.expect("thread list", STOPPED_DUE_TO_SIGNAL,
-                      substrs = ['stopped', stop_reason])
-
         process = target.GetProcess()
         self.assertTrue(process.GetState() == lldb.eStateStopped,
                         PROCESS_STOPPED)

Modified: lldb/trunk/test/functionalities/register/a.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/register/a.cpp?rev=247090&r1=247089&r2=247090&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/register/a.cpp (original)
+++ lldb/trunk/test/functionalities/register/a.cpp Tue Sep  8 17:41:13 2015
@@ -13,7 +13,6 @@ return_long_double (long double value)
 {
     float a=2, b=4,c=8, d=16, e=32, f=64, k=128, l=256, add=0;
     __asm__ (
-        "int3 ;"
         "flds %1 ;"
         "flds %2 ;"
         "flds %3 ;"