6 files changed, 16 insertions, 17 deletions
diff --git a/test/Object/Mips/abi-flags.yaml b/test/Object/Mips/abi-flags.yaml
index 8a11fc4124c3..0d9fb369423a 100644
--- a/test/Object/Mips/abi-flags.yaml
+++ b/test/Object/Mips/abi-flags.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj -format=elf %s > %t
+# RUN: yaml2obj %s > %t
 # RUN: llvm-readobj -mips-abi-flags %t | FileCheck -check-prefix=OBJ %s
 # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
 
@@ -34,6 +34,7 @@
 # YAML-NEXT:   CPR1Size:        REG_64
 # YAML-NEXT:   Flags1:          [ ODDSPREG ]
 
+!ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2MSB
diff --git a/test/Object/Mips/elf-abi.yaml b/test/Object/Mips/elf-abi.yaml
index 5f11b14da596..3a7b05e01cd3 100644
--- a/test/Object/Mips/elf-abi.yaml
+++ b/test/Object/Mips/elf-abi.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj -format=elf -docnum=1 %s > %t.o32
+# RUN: yaml2obj -docnum=1 %s > %t.o32
 # RUN: llvm-readobj -file-headers %t.o32 | FileCheck -check-prefix=O32OBJ %s
 # RUN: obj2yaml %t.o32 | FileCheck -check-prefix=O32YAML %s
 
@@ -10,7 +10,7 @@
 
 # O32YAML:  Flags:  [ EF_MIPS_PIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
 
-# RUN: yaml2obj -format=elf -docnum=2 %s > %t.o64
+# RUN: yaml2obj -docnum=2 %s > %t.o64
 # RUN: llvm-readobj -file-headers %t.o64 | FileCheck -check-prefix=O64OBJ %s
 # RUN: obj2yaml %t.o64 | FileCheck -check-prefix=O64YAML %s
 
@@ -22,7 +22,7 @@
 
 # O64YAML:  Flags:  [ EF_MIPS_PIC, EF_MIPS_ABI_O64, EF_MIPS_ARCH_64 ]
 
-# RUN: yaml2obj -format=elf -docnum=3 %s > %t.eabi32
+# RUN: yaml2obj -docnum=3 %s > %t.eabi32
 # RUN: llvm-readobj -file-headers %t.eabi32 | FileCheck -check-prefix=E32OBJ %s
 # RUN: obj2yaml %t.eabi32 | FileCheck -check-prefix=E32YAML %s
 
@@ -34,7 +34,7 @@
 
 # E32YAML:  Flags:  [ EF_MIPS_PIC, EF_MIPS_ABI_EABI32, EF_MIPS_ARCH_32 ]
 
-# RUN: yaml2obj -format=elf -docnum=4 %s > %t.eabi64
+# RUN: yaml2obj -docnum=4 %s > %t.eabi64
 # RUN: llvm-readobj -file-headers %t.eabi64 | FileCheck -check-prefix=E64OBJ %s
 # RUN: obj2yaml %t.eabi64 | FileCheck -check-prefix=E64YAML %s
 
@@ -47,7 +47,7 @@
 # E64YAML:  Flags:  [ EF_MIPS_PIC, EF_MIPS_ABI_EABI64, EF_MIPS_ARCH_64 ]
 
 # o32
----
+--- !ELF
 FileHeader:
   Class:           ELFCLASS32
   Data:            ELFDATA2LSB
@@ -69,7 +69,7 @@ Symbols:
       Size:    4
 
 # o64
----
+--- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
@@ -91,7 +91,7 @@ Symbols:
       Size:    4
 
 # eabio32
----
+--- !ELF
 FileHeader:
   Class:           ELFCLASS32
   Data:            ELFDATA2LSB
@@ -113,7 +113,7 @@ Symbols:
       Size:    4
 
 # eabi64
----
+--- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
diff --git a/test/Object/Mips/elf-flags.yaml b/test/Object/Mips/elf-flags.yaml
index f79be9d4e078..dceabc05c8b1 100644
--- a/test/Object/Mips/elf-flags.yaml
+++ b/test/Object/Mips/elf-flags.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj -format=elf %s > %t
+# RUN: yaml2obj %s > %t
 # RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=OBJ %s
 # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
 
@@ -25,7 +25,7 @@
 # YAML-NEXT:   Machine:         EM_MIPS
 # YAML-NEXT:   Flags:           [ EF_MIPS_NOREORDER, EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI2, EF_MIPS_32BITMODE, EF_MIPS_FP64, EF_MIPS_NAN2008, EF_MIPS_MICROMIPS, EF_MIPS_ARCH_ASE_M16, EF_MIPS_ARCH_ASE_MDMX, EF_MIPS_ABI_O32, EF_MIPS_MACH_OCTEON, EF_MIPS_ARCH_32R6 ]
 
----
+--- !ELF
 FileHeader:
   Class:    ELFCLASS32
   Data:     ELFDATA2LSB
diff --git a/test/Object/Mips/elf-mips64-rel.yaml b/test/Object/Mips/elf-mips64-rel.yaml
index 7c41b78e6adc..3e5655534753 100644
--- a/test/Object/Mips/elf-mips64-rel.yaml
+++ b/test/Object/Mips/elf-mips64-rel.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj -format=elf %s > %t
+# RUN: yaml2obj %s > %t
 # RUN: llvm-readobj -r %t | FileCheck -check-prefix=OBJ %s
 # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
 
@@ -41,7 +41,7 @@
 # YAML-NEXT:     Type2:       R_MIPS_LO16
 # YAML-NEXT:     SpecSym:     RSS_GP0
 
----
+--- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
diff --git a/test/Object/Mips/feature.test b/test/Object/Mips/feature.test
index 340301450a50..eea33b9325ba 100644
--- a/test/Object/Mips/feature.test
+++ b/test/Object/Mips/feature.test
@@ -1,5 +1,4 @@
-RUN: llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 %p/../Inputs/dext-test.elf-mips64r2 \
-RUN: | FileCheck %s
+RUN: llvm-objdump -disassemble %p/../Inputs/dext-test.elf-mips64r2 | FileCheck %s
 
 CHECK: Disassembly of section .text:
 CHECK: dext:
diff --git a/test/Object/Mips/objdump-micro-mips.test b/test/Object/Mips/objdump-micro-mips.test
index 0f28dc1a5f1c..6ce1cdc1c19b 100644
--- a/test/Object/Mips/objdump-micro-mips.test
+++ b/test/Object/Mips/objdump-micro-mips.test
@@ -1,5 +1,4 @@
-RUN: llvm-objdump -d -mattr=micromips %p/../Inputs/micro-mips.elf-mipsel \
-RUN:   | FileCheck %s
+RUN: llvm-objdump -d %p/../Inputs/micro-mips.elf-mipsel | FileCheck %s
 
 CHECK:      foo:
 CHECK-NEXT:      330:   bd 33 f8 ff   addiu   $sp, $sp, -8