Merging r260390:

[oota-llvm.git] / test / Object / size-trivial-macho.test

diff --git a/test/Object/size-trivial-macho.test b/test/Object/size-trivial-macho.test
index 6602d565186027b75d51b2bb1a8d15a78dc7bf32..a6d3d1c43304731cdb254b8ce206babcef5f2748 100644 (file)
--- a/test/Object/size-trivial-macho.test
+++ b/test/Object/size-trivial-macho.test
@@ -8,12 +8,16 @@ RUN: llvm-size %p/Inputs/macho-archive-x86_64.a \
 RUN:         | FileCheck %s -check-prefix AR
 RUN: llvm-size -format darwin %p/Inputs/macho-archive-x86_64.a \
 RUN:         | FileCheck %s -check-prefix mAR
-RUN: llvm-size -format darwin -x -l %p/Inputs/hello-world.macho-x86_64 \
+RUN: llvm-size -m -x -l %p/Inputs/hello-world.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix mxl
-RUN: llvm-size %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-size -arch all %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix u
-RUN: llvm-size %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-size -arch i386 %p/Inputs/macho-universal.x86_64.i386 \
+RUN:         | FileCheck %s -check-prefix u-i386
+RUN: llvm-size -arch all %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix uAR
+RUN: llvm-size -arch x86_64 %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN:         | FileCheck %s -check-prefix uAR-x86_64
 
 A: section              size   addr
 A: __text                 12      0
@@ -74,6 +78,12 @@ u: __TEXT    __DATA  __OBJC  others  dec     hex
 u: 4096        0       0       4294971392      4294975488      100002000       {{.*}}/macho-universal.x86_64.i386 (for architecture x86_64)
 u: 4096        0       0       8192    12288   3000    {{.*}}/macho-universal.x86_64.i386 (for architecture i386)
 
+u-i386: __TEXT __DATA  __OBJC  others  dec     hex
+u-i386: 4096   0       0       8192    12288   3000    
+
 uAR: __TEXT    __DATA  __OBJC  others  dec     hex
 uAR: 136       0       0       32      168     a8      {{.*}}/macho-universal-archive.x86_64.i386(hello.o) (for architecture x86_64)
 uAR: 5 4       0       0       9       9       {{.*}}/macho-universal-archive.x86_64.i386(foo.o) (for architecture i386)
+
+uAR-x86_64: __TEXT     __DATA  __OBJC  others  dec     hex
+uAR-x86_64: 136        0       0       32      168     a8      {{.*}}/macho-universal-archive.x86_64.i386(hello.o)