[Lldb-commits] [lldb] r155420 - in /lldb/trunk/test/python_api/formatters: TestFormattersSBAPI.py main.cpp

[Enrico Granata]

Author: enrico
Date: Mon Apr 23 21:01:17 2012
New Revision: 155420

URL: http://llvm.org/viewvc/llvm-project?rev=155420&view=rev
Log:
Fixing the test case so that it runs correctly on i386 as well as on x86_64

Modified:
    lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py
    lldb/trunk/test/python_api/formatters/main.cpp

Modified: lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py?rev=155420&r1=155419&r2=155420&view=diff
==============================================================================
--- lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py (original)
+++ lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py Mon Apr 23 21:01:17 2012
@@ -76,27 +76,27 @@
         self.expect("frame variable foo.A",
              substrs = ['0x00000001'])
         self.expect("frame variable foo.E", matching=False,
-             substrs = ['0x00000000b8cca70a'])
+             substrs = ['b8cca70a'])
 
         category.AddTypeFormat(lldb.SBTypeNameSpecifier("long"),format)
         self.expect("frame variable foo.A",
              substrs = ['0x00000001'])
         self.expect("frame variable foo.E",
-             substrs = ['0x00000000b8cca70a'])
+             substrs = ['b8cca70a'])
         
         format.format = lldb.eFormatOctal
         category.AddTypeFormat(lldb.SBTypeNameSpecifier("int"),format)
         self.expect("frame variable foo.A",
              substrs = ['01'])
         self.expect("frame variable foo.E",
-             substrs = ['0x00000000b8cca70a'])
+             substrs = ['b8cca70a'])
         
         category.DeleteTypeFormat(lldb.SBTypeNameSpecifier("int"))
         category.DeleteTypeFormat(lldb.SBTypeNameSpecifier("long"))
         self.expect("frame variable foo.A", matching=False,
              substrs = ['01'])
         self.expect("frame variable foo.E", matching=False,
-             substrs = ['0x00000000b8cca70a'])
+             substrs = ['b8cca70a'])
 
         summary = lldb.SBTypeSummary.CreateWithSummaryString("the hello world you'll never see")
         summary.SetSummaryString('hello world')

Modified: lldb/trunk/test/python_api/formatters/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/formatters/main.cpp?rev=155420&r1=155419&r2=155420&view=diff
==============================================================================
--- lldb/trunk/test/python_api/formatters/main.cpp (original)
+++ lldb/trunk/test/python_api/formatters/main.cpp Mon Apr 23 21:01:17 2012
@@ -28,12 +28,14 @@
 	foo.C = 'e';
 	foo.D = 6.28;
 	foo.E = 3100419850;
+	foo.F = 0;
 	FooType bar;
 	bar.A = 1;
 	bar.B = 3.14;
 	bar.C = 'e';
 	bar.D = 6.28;
 	bar.E = 3100419850;
+	bar.F = 0;
 	JustAStruct* foo_ptr = &foo;
 	std::vector<int> int_vector;
 	return 0; // Set break point at this line.