Fixing the test case so that it runs correctly on i386 as well as on x86_64

llvm-svn: 155420

2 files changed, 6 insertions, 4 deletions

diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
index 79359da49c2..ef9ca16282c 100644
--- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
@@ -76,27 +76,27 @@ class SBFormattersAPITestCase(TestBase):
         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')
diff --git a/lldb/test/python_api/formatters/main.cpp b/lldb/test/python_api/formatters/main.cpp
index e26467e9fb0..67754de4376 100644
--- a/lldb/test/python_api/formatters/main.cpp
+++ b/lldb/test/python_api/formatters/main.cpp
@@ -28,12 +28,14 @@ int main(int argc, char const *argv[]) {
 	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.