From 11f99878762e479766370e0cde051547c1c4911b Mon Sep 17 00:00:00 2001 From: Matt Beaumont-Gay Date: Mon, 31 Oct 2011 23:56:52 +0000 Subject: [PATCH] Change the actual tests to match the input directory rename (duh) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143404 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Object/nm-archive.test | 4 ++-- test/Object/nm-trivial-object.test | 8 ++++---- test/Object/objdump-disassembly-inline-relocations.test | 4 ++-- test/Object/objdump-file-header.test | 4 ++-- test/Object/objdump-relocations.test | 8 ++++---- test/Object/objdump-section-content.test | 4 ++-- test/Object/objdump-sectionheaders.test | 2 +- test/Object/objdump-symbol-table.test | 4 ++-- test/Object/objdump-trivial-object.test | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/test/Object/nm-archive.test b/test/Object/nm-archive.test index 8ed81bfaacc..2d96b73a271 100644 --- a/test/Object/nm-archive.test +++ b/test/Object/nm-archive.test @@ -1,6 +1,6 @@ -RUN: llvm-nm %p/TestObjectFiles/archive-test.a-coff-i386 \ +RUN: llvm-nm %p/Inputs/archive-test.a-coff-i386 \ RUN: | FileCheck %s -check-prefix COFF -RUN: llvm-as %p/TestObjectFiles/trivial.ll -o=%t1 +RUN: llvm-as %p/Inputs/trivial.ll -o=%t1 RUN: llvm-ar rcs %t2 %t1 RUN: llvm-nm %t2 | FileCheck %s -check-prefix BITCODE diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test index 6de1780a160..3f418d7ea8b 100644 --- a/test/Object/nm-trivial-object.test +++ b/test/Object/nm-trivial-object.test @@ -1,10 +1,10 @@ -RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-nm %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF -RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.coff-x86-64 \ +RUN: llvm-nm %p/Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF -RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-nm %p/TestObjectFiles/trivial-object-test.elf-x86-64 \ +RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF COFF: 00000000 d .data diff --git a/test/Object/objdump-disassembly-inline-relocations.test b/test/Object/objdump-disassembly-inline-relocations.test index 91f2e48f623..1e8b72a3c70 100644 --- a/test/Object/objdump-disassembly-inline-relocations.test +++ b/test/Object/objdump-disassembly-inline-relocations.test @@ -1,6 +1,6 @@ -RUN: llvm-objdump -d -r %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -d -r %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -d -r %p/TestObjectFiles/trivial-object-test.coff-x86-64 \ +RUN: llvm-objdump -d -r %p/Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF-x86-64 COFF-i386: file format COFF-i386 diff --git a/test/Object/objdump-file-header.test b/test/Object/objdump-file-header.test index aa92a6bfab2..3fce3f40719 100644 --- a/test/Object/objdump-file-header.test +++ b/test/Object/objdump-file-header.test @@ -1,6 +1,6 @@ -RUN: llvm-objdump -f %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -f %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -f %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -f %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 XFAIL: * diff --git a/test/Object/objdump-relocations.test b/test/Object/objdump-relocations.test index 2dcdb432ef6..c4b564e7231 100644 --- a/test/Object/objdump-relocations.test +++ b/test/Object/objdump-relocations.test @@ -1,10 +1,10 @@ -RUN: llvm-objdump -r %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -r %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -r %p/TestObjectFiles/trivial-object-test.coff-x86-64 \ +RUN: llvm-objdump -r %p/Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF-x86-64 -RUN: llvm-objdump -r %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -r %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 -RUN: llvm-objdump -r %p/TestObjectFiles/trivial-object-test.elf-x86-64 \ +RUN: llvm-objdump -r %p/Inputs/trivial-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF-x86-64 COFF-i386: .text diff --git a/test/Object/objdump-section-content.test b/test/Object/objdump-section-content.test index 37f53304ef9..581e75eb5ac 100644 --- a/test/Object/objdump-section-content.test +++ b/test/Object/objdump-section-content.test @@ -1,6 +1,6 @@ -RUN: llvm-objdump -s %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -s %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -s %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -s %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 COFF-i386: trivial-object-test.coff-i386: file format diff --git a/test/Object/objdump-sectionheaders.test b/test/Object/objdump-sectionheaders.test index 4515d00e618..a417d07a81c 100644 --- a/test/Object/objdump-sectionheaders.test +++ b/test/Object/objdump-sectionheaders.test @@ -1,4 +1,4 @@ -; RUN: llvm-objdump -h %p/TestObjectFiles/trivial-object-test.elf-x86-64 \ +; RUN: llvm-objdump -h %p/Inputs/trivial-object-test.elf-x86-64 \ ; RUN: | FileCheck %s ; To verify this, use readelf -S, not objdump -h. Binutils objdump filters the diff --git a/test/Object/objdump-symbol-table.test b/test/Object/objdump-symbol-table.test index 16b0d773e5a..e9d4cbac066 100644 --- a/test/Object/objdump-symbol-table.test +++ b/test/Object/objdump-symbol-table.test @@ -1,6 +1,6 @@ -RUN: llvm-objdump -t %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -t %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -t %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -t %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 COFF-i386: trivial-object-test.coff-i386: file format diff --git a/test/Object/objdump-trivial-object.test b/test/Object/objdump-trivial-object.test index c4855fdfd68..951cd403d4d 100644 --- a/test/Object/objdump-trivial-object.test +++ b/test/Object/objdump-trivial-object.test @@ -1,10 +1,10 @@ -RUN: llvm-objdump -d %p/TestObjectFiles/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -d %p/Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump -d %p/TestObjectFiles/trivial-object-test.coff-x86-64 \ +RUN: llvm-objdump -d %p/Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF-x86-64 -RUN: llvm-objdump -d %p/TestObjectFiles/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -d %p/Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 -RUN: llvm-objdump -d %p/TestObjectFiles/trivial-object-test.elf-x86-64 \ +RUN: llvm-objdump -d %p/Inputs/trivial-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF-x86-64 COFF-i386: file format COFF-i386 -- 2.34.1