From b4e2d471f762fc760c26f781a7a86ec3c8ab7355 Mon Sep 17 00:00:00 2001 From: Owen Reynolds Date: Thu, 26 Sep 2019 12:32:11 +0000 Subject: [PATCH] [llvm-ar][test] Move MRI tests from "llvm/test/Object/" llvm/test/Object/ contains tests for the ArchiveWriter library, however support for MRI scripts is found in llvm-ar and not the library. This diff moves the MRI related tests and removes those that are duplicates. Differential Revision: https://reviews.llvm.org/D68038 llvm-svn: 372973 --- llvm/test/Object/mri-addlib.test | 14 ---- llvm/test/Object/mri-addmod.test | 82 ---------------------- .../{Object => tools/llvm-ar}/Inputs/mri-crlf.mri | 0 llvm/test/{Object => tools/llvm-ar}/mri-crlf.test | 0 llvm/test/{Object => tools/llvm-ar}/mri1.test | 0 llvm/test/{Object => tools/llvm-ar}/mri2.test | 0 llvm/test/{Object => tools/llvm-ar}/mri3.test | 0 llvm/test/{Object => tools/llvm-ar}/mri4.test | 0 llvm/test/{Object => tools/llvm-ar}/mri5.test | 0 9 files changed, 96 deletions(-) delete mode 100644 llvm/test/Object/mri-addlib.test delete mode 100644 llvm/test/Object/mri-addmod.test rename llvm/test/{Object => tools/llvm-ar}/Inputs/mri-crlf.mri (100%) rename llvm/test/{Object => tools/llvm-ar}/mri-crlf.test (100%) rename llvm/test/{Object => tools/llvm-ar}/mri1.test (100%) rename llvm/test/{Object => tools/llvm-ar}/mri2.test (100%) rename llvm/test/{Object => tools/llvm-ar}/mri3.test (100%) rename llvm/test/{Object => tools/llvm-ar}/mri4.test (100%) rename llvm/test/{Object => tools/llvm-ar}/mri5.test (100%) diff --git a/llvm/test/Object/mri-addlib.test b/llvm/test/Object/mri-addlib.test deleted file mode 100644 index 745bcf6..0000000 --- a/llvm/test/Object/mri-addlib.test +++ /dev/null @@ -1,14 +0,0 @@ -; RUN: echo create %t.a > %t.mri -; RUN: echo addlib %p/Inputs/GNU.a >> %t.mri -; RUN: echo addlib %p/Inputs/archive-test.a-gnu-minimal >> %t.mri -; RUN: echo save >> %t.mri -; RUN: echo end >> %t.mri - -; RUN: llvm-ar -M < %t.mri -; RUN: llvm-ar t %t.a | FileCheck %s - -; CHECK: evenlen -; CHECK-NEXT: oddlen -; CHECK-NEXT: very_long_bytecode_file_name.bc -; CHECK-NEXT: IsNAN.o -; CHECK-NEXT: test diff --git a/llvm/test/Object/mri-addmod.test b/llvm/test/Object/mri-addmod.test deleted file mode 100644 index 4a0372a..0000000 --- a/llvm/test/Object/mri-addmod.test +++ /dev/null @@ -1,82 +0,0 @@ -# RUN: yaml2obj -docnum=1 %s > %t.elf-x86-64 -# RUN: echo create %t.a > %t.mri -# RUN: echo 'addmod "%t.elf-x86-64"' >> %t.mri -# RUN: echo save >> %t.mri -# RUN: echo end >> %t.mri - ---- !ELF -FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 -Sections: - - Name: .text - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR ] -Symbols: - - Name: main - Type: STT_FUNC - Section: .text - Binding: STB_GLOBAL - Size: 0x0000000000000024 - - Name: SomeOtherFunction - Binding: STB_GLOBAL - - Name: puts - Binding: STB_GLOBAL - -# RUN: llvm-ar -M < %t.mri -# RUN: llvm-nm -M %t.a | FileCheck %s - -# CHECK: Archive map -# CHECK-NEXT: main in {{.*}}elf-x86-64 - -# CHECK: {{.*}}elf-x86-64: -# CHECK-NEXT: U SomeOtherFunction -# CHECK-NEXT: 0000000000000000 T main -# CHECK-NEXT: U puts - -## Now test that CREATE overwrites an existing file. -# RUN: yaml2obj -docnum=2 %s > %t2.elf-x86-64 - -# RUN: echo create %t.a > %t2.mri -# RUN: echo addmod %t2.elf-x86-64 >> %t2.mri -# RUN: echo save >> %t2.mri -# RUN: echo end >> %t2.mri - -# RUN: llvm-ar -M < %t2.mri -# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=NEW %s - -# NEW: Archive map -# NEW-NEXT: foo in {{.*}}2.elf-x86-64 -# NEW-NEXT: main in {{.*}}2.elf-x86-64 - -# NEW: {{.*}}2.elf-x86-64: -# NEW-NEXT: 0000000000000000 t bar -# NEW-NEXT: 0000000000000006 T foo -# NEW-NEXT: 0000000000000016 T main - ---- !ELF -FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 -Sections: - - Name: .text - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR ] -Symbols: - - Name: bar - Type: STT_FUNC - Section: .text - - Name: foo - Type: STT_FUNC - Section: .text - Binding: STB_GLOBAL - Value: 0x0000000000000006 - - Name: main - Type: STT_FUNC - Section: .text - Binding: STB_GLOBAL - Value: 0x0000000000000016 diff --git a/llvm/test/Object/Inputs/mri-crlf.mri b/llvm/test/tools/llvm-ar/Inputs/mri-crlf.mri similarity index 100% rename from llvm/test/Object/Inputs/mri-crlf.mri rename to llvm/test/tools/llvm-ar/Inputs/mri-crlf.mri diff --git a/llvm/test/Object/mri-crlf.test b/llvm/test/tools/llvm-ar/mri-crlf.test similarity index 100% rename from llvm/test/Object/mri-crlf.test rename to llvm/test/tools/llvm-ar/mri-crlf.test diff --git a/llvm/test/Object/mri1.test b/llvm/test/tools/llvm-ar/mri1.test similarity index 100% rename from llvm/test/Object/mri1.test rename to llvm/test/tools/llvm-ar/mri1.test diff --git a/llvm/test/Object/mri2.test b/llvm/test/tools/llvm-ar/mri2.test similarity index 100% rename from llvm/test/Object/mri2.test rename to llvm/test/tools/llvm-ar/mri2.test diff --git a/llvm/test/Object/mri3.test b/llvm/test/tools/llvm-ar/mri3.test similarity index 100% rename from llvm/test/Object/mri3.test rename to llvm/test/tools/llvm-ar/mri3.test diff --git a/llvm/test/Object/mri4.test b/llvm/test/tools/llvm-ar/mri4.test similarity index 100% rename from llvm/test/Object/mri4.test rename to llvm/test/tools/llvm-ar/mri4.test diff --git a/llvm/test/Object/mri5.test b/llvm/test/tools/llvm-ar/mri5.test similarity index 100% rename from llvm/test/Object/mri5.test rename to llvm/test/tools/llvm-ar/mri5.test -- 2.7.4