This is an archive of the discontinued LLVM Phabricator instance.

Differential D68038

[llvm-ar][test] Move MRI tests from "llvm/test/Object/"
ClosedPublic

Authored by gbreynoo on Sep 25 2019, 10:29 AM.

Details

Reviewers
rupprecht
MaskRay
grimar
Commits
rGb4e2d471f762: [llvm-ar][test] Move MRI tests from "llvm/test/Object/"
rL372973: [llvm-ar][test] Move MRI tests from "llvm/test/Object/"
Summary

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.

Diff Detail

Event Timeline

gbreynoo created this revision.Sep 25 2019, 10:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 25 2019, 10:29 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
gbreynoo added a comment.Sep 25 2019, 10:34 AM

There are many tests in this area that use llvm-ar to test the underlying library. It may be better for these also to be in the llvm-ar test directory and have unit tests for specifically testing ArchiveWriter?

grimar accepted this revision.Sep 26 2019, 2:33 AM

This patch looks reasonable. Perhaps wait for someone else to take a look too.

This revision is now accepted and ready to land.Sep 26 2019, 2:33 AM
MaskRay accepted this revision.Sep 26 2019, 2:40 AM
Closed by commit rL372973: [llvm-ar][test] Move MRI tests from "llvm/test/Object/" (authored by gbreynoo). · Explain WhySep 26 2019, 5:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 221802

llvm/test/Object/Inputs/mri-crlf.mri

  • This file was moved to llvm/test/tools/llvm-ar/Inputs/mri-crlf.mri.

llvm/test/Object/mri-addlib.test

  • This file was deleted.
; 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

llvm/test/Object/mri-addmod.test

  • This file was deleted.
# 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

llvm/test/Object/mri-crlf.test

  • This file was moved to llvm/test/tools/llvm-ar/mri-crlf.test.

llvm/test/Object/mri1.test

  • This file was moved to llvm/test/tools/llvm-ar/mri1.test.

llvm/test/Object/mri2.test

  • This file was moved to llvm/test/tools/llvm-ar/mri2.test.

llvm/test/Object/mri3.test

  • This file was moved to llvm/test/tools/llvm-ar/mri3.test.

llvm/test/Object/mri4.test

  • This file was moved to llvm/test/tools/llvm-ar/mri4.test.

llvm/test/Object/mri5.test

  • This file was moved to llvm/test/tools/llvm-ar/mri5.test.

llvm/test/tools/llvm-ar/Inputs/mri-crlf.mri

  • This file was moved from llvm/test/Object/Inputs/mri-crlf.mri.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri-crlf.test

  • This file was moved from llvm/test/Object/mri-crlf.test.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri1.test

  • This file was moved from llvm/test/Object/mri1.test.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri2.test

  • This file was moved from llvm/test/Object/mri2.test.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri3.test

  • This file was moved from llvm/test/Object/mri3.test.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri4.test

  • This file was moved from llvm/test/Object/mri4.test.
The contents of this file were not changed.

llvm/test/tools/llvm-ar/mri5.test

  • This file was moved from llvm/test/Object/mri5.test.
The contents of this file were not changed.