Index: llvm/trunk/test/Object/objdump-file-header.test
===================================================================
--- llvm/trunk/test/Object/objdump-file-header.test
+++ llvm/trunk/test/Object/objdump-file-header.test
@@ -1,22 +0,0 @@
-# RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386
-
-# COFF-i386: : file format COFF-i386
-# COFF-i386: architecture: i386
-# COFF-i386: start address: 0x00000000{{$}}
-
-# RUN: yaml2obj %s > %t-i386
-# RUN: llvm-objdump -f %t-i386 | FileCheck %s -check-prefix ELF-i386
-
-# ELF-i386: : file format ELF32-i386
-# ELF-i386: architecture: i386
-# ELF-i386: start address: 0x00000000{{$}}
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS32
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_386
-Symbols:
-  - Name:    foo
-    Binding: STB_GLOBAL
Index: llvm/trunk/test/tools/llvm-objdump/file-headers-coff.test
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/file-headers-coff.test
+++ llvm/trunk/test/tools/llvm-objdump/file-headers-coff.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s > %t
-# RUN: llvm-objdump -f %t | FileCheck %s
-# RUN: llvm-objdump -file-headers %t | FileCheck %s
+# RUN: llvm-objdump -f %t | FileCheck %s -DFILE=%t
+# RUN: llvm-objdump -file-headers %t | FileCheck %s -DFILE=%t
 
 !COFF
 header: !Header
@@ -9,5 +9,6 @@
 sections:
 symbols:
 
+# CHECK: [[FILE]]: file format COFF-i386
 # CHECK: architecture: i386
 # CHECK: start address: 0x00000000
Index: llvm/trunk/test/tools/llvm-objdump/file-headers-elf.test
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/file-headers-elf.test
+++ llvm/trunk/test/tools/llvm-objdump/file-headers-elf.test
@@ -1,6 +1,6 @@
-# RUN: yaml2obj %s > %t
-# RUN: llvm-objdump -f %t | FileCheck %s
-# RUN: llvm-objdump -file-headers %t | FileCheck %s
+# RUN: yaml2obj --docnum=1 %s > %t
+# RUN: llvm-objdump -f %t | FileCheck %s -DFILE=%t -check-prefix ELF64
+# RUN: llvm-objdump -file-headers %t | FileCheck %s -DFILE=%t -check-prefix ELF64
 
 !ELF
 FileHeader:
@@ -10,5 +10,22 @@
   Machine:         EM_X86_64
   Entry:           0x123456789abcde
 
-# CHECK: architecture: x86_64
-# CHECK: start address: 0x00123456789abcde
+# ELF64: [[FILE]]: file format ELF64-x86-64
+# ELF64: architecture: x86_64
+# ELF64: start address: 0x00123456789abcde
+
+# RUN: yaml2obj --docnum=2 %s > %t-i386
+# RUN: llvm-objdump -f %t-i386 | FileCheck -DFILE=%t-i386 %s -check-prefix ELF32
+# RUN: llvm-objdump -file-headers %t-i386 | FileCheck %s -DFILE=%t-i386 -check-prefix ELF32
+
+# ELF32: [[FILE]]: file format ELF32-i386
+# ELF32: architecture: i386
+# ELF32: start address: 0x12345678
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_386
+  Entry:   0x12345678