Move tests for llvm-objdump for universal files to X86 directory to fix build bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223306 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-objdump/Inputs/macho-universal-archive.x86_64.i386 b/test/tools/llvm-objdump/Inputs/macho-universal-archive.x86_64.i386
deleted file mode 100644 (file)
index 1660714..0000000
Binary files a/test/tools/llvm-objdump/Inputs/macho-universal-archive.x86_64.i386 and /dev/null differ

diff --git a/test/tools/llvm-objdump/Inputs/macho-universal.x86_64.i386 b/test/tools/llvm-objdump/Inputs/macho-universal.x86_64.i386
deleted file mode 100755 (executable)
index 36d5fc2..0000000
Binary files a/test/tools/llvm-objdump/Inputs/macho-universal.x86_64.i386 and /dev/null differ

diff --git a/test/tools/llvm-objdump/X86/Inputs/macho-universal-archive.x86_64.i386 b/test/tools/llvm-objdump/X86/Inputs/macho-universal-archive.x86_64.i386
new file mode 100644 (file)
index 0000000..1660714
Binary files /dev/null and b/test/tools/llvm-objdump/X86/Inputs/macho-universal-archive.x86_64.i386 differ

diff --git a/test/tools/llvm-objdump/X86/Inputs/macho-universal.x86_64.i386 b/test/tools/llvm-objdump/X86/Inputs/macho-universal.x86_64.i386
new file mode 100755 (executable)
index 0000000..36d5fc2
Binary files /dev/null and b/test/tools/llvm-objdump/X86/Inputs/macho-universal.x86_64.i386 differ

diff --git a/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test b/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test
new file mode 100644 (file)
index 0000000..9f1b513
--- /dev/null
+++ b/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test
@@ -0,0 +1,25 @@
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \
+RUN: | FileCheck %s -check-prefix UEXE-all
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch i386 \
+RUN: | FileCheck %s -check-prefix UArchive-i386
+
+UEXE-all: macho-universal.x86_64.i386 (architecture x86_64):
+UEXE-all: (__TEXT,__text) section
+UEXE-all: _main:
+UEXE-all: 0000000100000f60     pushq   %rbp
+UEXE-all: 0000000100000f61     movq    %rsp, %rbp
+UEXE-all: macho-universal.x86_64.i386 (architecture i386):
+UEXE-all: (__TEXT,__text) section
+UEXE-all: _main:
+UEXE-all: 00001fa0     pushl   %ebp
+UEXE-all: 00001fa1     movl    %esp, %ebp
+
+UArchive-i386: Archive : {{.*}}/macho-universal-archive.x86_64.i386
+UArchive-i386: macho-universal-archive.x86_64.i386(foo.o):
+UArchive-i386: (__TEXT,__text) section
+UArchive-i386: _foo:
+UArchive-i386: 00000000        pushl   %ebp
+UArchive-i386: 00000001        movl    %esp, %ebp
+UArchive-i386: 00000003        popl    %ebp
+UArchive-i386: 00000004        retl
+

diff --git a/test/tools/llvm-objdump/macho-universal-x86_64.i386.test b/test/tools/llvm-objdump/macho-universal-x86_64.i386.test
deleted file mode 100644 (file)
index 9f1b513..0000000
--- a/test/tools/llvm-objdump/macho-universal-x86_64.i386.test
+++ /dev/null
@@ -1,25 +0,0 @@
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \
-RUN: | FileCheck %s -check-prefix UEXE-all
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch i386 \
-RUN: | FileCheck %s -check-prefix UArchive-i386
-
-UEXE-all: macho-universal.x86_64.i386 (architecture x86_64):
-UEXE-all: (__TEXT,__text) section
-UEXE-all: _main:
-UEXE-all: 0000000100000f60     pushq   %rbp
-UEXE-all: 0000000100000f61     movq    %rsp, %rbp
-UEXE-all: macho-universal.x86_64.i386 (architecture i386):
-UEXE-all: (__TEXT,__text) section
-UEXE-all: _main:
-UEXE-all: 00001fa0     pushl   %ebp
-UEXE-all: 00001fa1     movl    %esp, %ebp
-
-UArchive-i386: Archive : {{.*}}/macho-universal-archive.x86_64.i386
-UArchive-i386: macho-universal-archive.x86_64.i386(foo.o):
-UArchive-i386: (__TEXT,__text) section
-UArchive-i386: _foo:
-UArchive-i386: 00000000        pushl   %ebp
-UArchive-i386: 00000001        movl    %esp, %ebp
-UArchive-i386: 00000003        popl    %ebp
-UArchive-i386: 00000004        retl
-