Re-enable testing of .s tests under test/CodeGen/X86.

These were temporarily disabled in 2013 and we apparently forgot to
ever turn them back on again.

Fix spelling of flag to llvm-mc in recently-added test that wasn't
actually being run due to this.

2 files changed, 1 insertions, 9 deletions

diff --git a/llvm/test/CodeGen/X86/align-branch-boundary-default.s b/llvm/test/CodeGen/X86/align-branch-boundary-default.s
index fef553d9640..6c579b38551 100644
--- a/llvm/test/CodeGen/X86/align-branch-boundary-default.s
+++ b/llvm/test/CodeGen/X86/align-branch-boundary-default.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -mtriple=x86_64-unknown-unknown -mcpu=skylake -filetype=obj < %s | llvm-objdump -d --no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc --triple=x86_64-unknown-unknown -mcpu=skylake -filetype=obj < %s | llvm-objdump -d --no-show-raw-insn - | FileCheck %s
 
 # The textual assembler *can't* default to autopadding as there's no syntax
 # to selectively disable it just yet.
diff --git a/llvm/test/CodeGen/X86/lit.local.cfg b/llvm/test/CodeGen/X86/lit.local.cfg
index 57054f24c20..c8625f4d9d2 100644
--- a/llvm/test/CodeGen/X86/lit.local.cfg
+++ b/llvm/test/CodeGen/X86/lit.local.cfg
@@ -1,10 +1,2 @@
-# FIXME: For now, override suffixes to exclude any .s tests, because some of the
-# buildbots have a stray misched-copy.s output file lying around that causes
-# failures. See misched-copy.s where we try and clean up that file.
-#
-# It should be possible to remove this override once all the bots have cycled
-# cleanly.
-config.suffixes = ['.ll', '.mir', '.test', '.txt']
-
 if not 'X86' in config.root.targets:
     config.unsupported = True