From 923123c370bd4c7bf3ec9150b4e0dc042c2f9428 Mon Sep 17 00:00:00 2001 From: Matt Beaumont-Gay Date: Thu, 2 Aug 2012 21:52:49 +0000 Subject: [PATCH] Move test yaml files under Inputs until they are converted to be the actual test files. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161219 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Object/{ => Inputs}/COFF/i386.yaml | 0 test/Object/{ => Inputs}/COFF/x86-64.yaml | 0 test/Object/nm-trivial-object.test | 6 ++++-- test/Object/objdump-file-header.test | 2 +- test/Object/objdump-section-content.test | 2 +- test/Object/objdump-symbol-table.test | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) rename test/Object/{ => Inputs}/COFF/i386.yaml (100%) rename test/Object/{ => Inputs}/COFF/x86-64.yaml (100%) diff --git a/test/Object/COFF/i386.yaml b/test/Object/Inputs/COFF/i386.yaml similarity index 100% rename from test/Object/COFF/i386.yaml rename to test/Object/Inputs/COFF/i386.yaml diff --git a/test/Object/COFF/x86-64.yaml b/test/Object/Inputs/COFF/x86-64.yaml similarity index 100% rename from test/Object/COFF/x86-64.yaml rename to test/Object/Inputs/COFF/x86-64.yaml diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test index b6f70a02a7a..8fd1c0482de 100644 --- a/test/Object/nm-trivial-object.test +++ b/test/Object/nm-trivial-object.test @@ -1,5 +1,7 @@ -RUN: yaml2obj %p/COFF/i386.yaml | llvm-nm | FileCheck %s -check-prefix COFF -RUN: yaml2obj %p/COFF/x86-64.yaml | llvm-nm | FileCheck %s -check-prefix COFF +RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-nm \ +RUN: | FileCheck %s -check-prefix COFF +RUN: yaml2obj %p/Inputs/COFF/x86-64.yaml | llvm-nm \ +RUN | FileCheck %s -check-prefix COFF RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \ diff --git a/test/Object/objdump-file-header.test b/test/Object/objdump-file-header.test index f35a8a1fa20..a552113d325 100644 --- a/test/Object/objdump-file-header.test +++ b/test/Object/objdump-file-header.test @@ -1,4 +1,4 @@ -RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386 +RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386 RUN: llvm-objdump -f %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 diff --git a/test/Object/objdump-section-content.test b/test/Object/objdump-section-content.test index 56b7989a605..f9c4f43f0be 100644 --- a/test/Object/objdump-section-content.test +++ b/test/Object/objdump-section-content.test @@ -1,4 +1,4 @@ -RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386 +RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386 RUN: llvm-objdump -s %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 diff --git a/test/Object/objdump-symbol-table.test b/test/Object/objdump-symbol-table.test index a721171c094..989ec04a8dd 100644 --- a/test/Object/objdump-symbol-table.test +++ b/test/Object/objdump-symbol-table.test @@ -1,4 +1,4 @@ -RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -t - \ +RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -t - \ RUN: | FileCheck %s -check-prefix COFF-i386 RUN: llvm-objdump -t %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 @@ -30,4 +30,4 @@ macho-i386: trivial-object-test.macho-i386: file format Mach-O 32-bit i38 macho-i386: SYMBOL TABLE: macho-i386: 00000000 g F __TEXT,__text 00000024 _main macho-i386: 00000000 *UND* 00000000 _SomeOtherFunction -macho-i386: 00000000 *UND* 00000000 _puts \ No newline at end of file +macho-i386: 00000000 *UND* 00000000 _puts -- 2.34.1