maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Reapply [llvm-ar][test] Increase llvm-ar test coverage" 

llvm-ar.extract.test has been failing on greendragon and gone unfixed.

llvm-svn: 365383
This commit is contained in:
JF Bastien 2019-07-08 20:06:36 +00:00
parent 8b1becf2e3
commit 5a6941820b
10 changed files with 17 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/test/tools/llvm-ar/create.test
View File

@ -1,14 +0,0 @@
## Test the creation warning and supression of that warning.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: rm -f %t.warning.ar
RUN: llvm-ar r %t.warning.ar %t1.txt %t2.txt 2>&1 \
RUN: | FileCheck %s -DOUTPUT=%t.warning.ar
CHECK: warning: creating [[OUTPUT]]
RUN: rm -f %t.supressed.ar
RUN: llvm-ar cr %t.supressed.ar %t1.txt %t2.txt 2>&1 \
RUN: | FileCheck --allow-empty /dev/null --implicit-check-not={{.}}

12
llvm/test/tools/llvm-ar/dash-before-letter.test
View File

@ -1,12 +0,0 @@
# Test the use of dash before key letters.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: rm -f %t.ar
RUN: llvm-ar s -cr %t.ar %t1.txt
RUN: llvm-ar -r -s %t.ar %t2.txt -s
RUN: llvm-ar -t %t.ar | FileCheck %s
CHECK: 1.txt
CHECK-NEXT: 2.txt

20
llvm/test/tools/llvm-ar/default-add.test
View File

@ -1,20 +1,34 @@
RUN: yaml2obj %S/Inputs/macho.yaml -o %t-macho.o RUN: yaml2obj %S/Inputs/macho.yaml -o %t-macho.o
RUN: yaml2obj %S/Inputs/coff.yaml -o %t-coff.o RUN: yaml2obj %S/Inputs/coff.yaml -o %t-coff.o
RUN: yaml2obj %S/Inputs/elf.yaml -o %t-elf.o
RUN: rm -f %t.ar RUN: rm -f %t.ar
RUN: llvm-ar crs %t.ar %t-macho.o RUN: llvm-ar crs %t.ar %t-macho.o
RUN: grep -q __.SYMDEF %t.ar RUN: grep -q __.SYMDEF %t.ar
Test that an option string prefixed by a dash works.
RUN: llvm-ar -crs %t.ar %t-coff.o
RUN: grep -q __.SYMDEF %t.ar
RUN: rm -f %t.ar RUN: rm -f %t.ar
RUN: llvm-ar crs %t.ar %t-coff.o RUN: llvm-ar crs %t.ar %t-coff.o
RUN: not grep -q __.SYMDEF %t.ar RUN: not grep -q __.SYMDEF %t.ar
RUN: llvm-ar crs %t.ar %t-macho.o RUN: llvm-ar crs %t.ar %t-macho.o
RUN: not grep -q __.SYMDEF %t.ar RUN: not grep -q __.SYMDEF %t.ar
RUN: llvm-ar crs %t.ar %t-elf.o
RUN: not grep -q __.SYMDEF %t.ar RUN: rm -f %t.ar
Test that multiple dashed options works.
RUN: llvm-ar -c -r -s %t.ar %t-macho.o
RUN: grep -q __.SYMDEF %t.ar
Test with duplicated options.
RUN: llvm-ar -c -r -s -c -s %t.ar %t-coff.o
RUN: grep -q __.SYMDEF %t.ar
RUN: rm -f %t.ar RUN: rm -f %t.ar
Test with the options in a different order. Test with the options in a different order.
RUN: llvm-ar rsc %t.ar %t-macho.o RUN: llvm-ar rsc %t.ar %t-macho.o
RUN: grep -q __.SYMDEF %t.ar RUN: grep -q __.SYMDEF %t.ar
Test with options everywhere.
RUN: llvm-ar rsc -cs -sc %t.ar %t-coff.o -cs -sc
RUN: grep -q __.SYMDEF %t.ar
Ensure that we select the existing format when updating.

67
llvm/test/tools/llvm-ar/delete.test
View File

@ -1,67 +0,0 @@
## Test the deletion of members and that symbols are removed from the symbol table.
# RUN: yaml2obj %s -o %t-delete.o --docnum=1
# RUN: yaml2obj %s -o %t-keep.o --docnum=2
# RUN: touch %t1.txt
# RUN: touch %t2.txt
## Add file:
# RUN: rm -f %t.a
# RUN: llvm-ar rc %t.a %t1.txt %t-delete.o %t-keep.o %t2.txt
# RUN: llvm-nm --print-armap %t.a \
# RUN: | FileCheck %s --check-prefix=SYMBOL-ADDED
# RUN: llvm-ar t %t.a | FileCheck %s --check-prefix=FILE-ADDED
# SYMBOL-ADDED: symbol1
# SYMBOL-ADDED-NEXT: symbol2
# FILE-ADDED: 1.txt
# FILE-ADDED-NEXT: delete.o
# FILE-ADDED-NEXT: keep.o
# FILE-ADDED-NEXT: 2.txt
## Delete file that is not a member:
# RUN: cp %t.a %t-archive-copy.a
# RUN: llvm-ar d %t.a t/missing.o
# RUN: cmp %t.a %t-archive-copy.a
## Delete file:
# RUN: llvm-ar d %t.a %t-delete.o
# RUN: llvm-nm --print-armap %t.a \
# RUN: | FileCheck %s --check-prefix=SYMBOL-DELETED --implicit-check-not symbol1
# RUN: llvm-ar t %t.a \
# RUN: | FileCheck %s --check-prefix=FILE-DELETED --implicit-check-not delete.o
# SYMBOL-DELETED: symbol2
# FILE-DELETED: 1.txt
# FILE-DELETED-NEXT: keep.o
# FILE-DELETED-NEXT: 2.txt
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
Sections:
- Name: .text
Type: SHT_PROGBITS
Symbols:
- Name: symbol1
Binding: STB_GLOBAL
Section: .text
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
Sections:
- Name: .text
Type: SHT_PROGBITS
Symbols:
- Name: symbol2
Binding: STB_GLOBAL
Section: .text

21
llvm/test/tools/llvm-ar/extract.test
View File

@ -1,21 +0,0 @@
## Test extract operation.
RUN: rm -rf %t && mkdir -p %t/extracted/
# Extracting from an empty archive should not warn or error:
RUN: llvm-ar cr %t/empty.a
RUN: llvm-ar x %t/empty.a 2>&1 \
RUN: | FileCheck --allow-empty /dev/null --implicit-check-not={{.}}
RUN: echo filea > %t/a.txt
RUN: echo fileb > %t/b.txt
RUN: llvm-ar rc %t/archive.a %t/a.txt %t/b.txt
# Single member:
RUN: cd %t/extracted && llvm-ar x %t/archive.a a.txt
RUN: diff %t/a.txt %t/extracted/a.txt
# All members:
RUN: rm %t/extracted/a.txt
RUN: cd %t/extracted && llvm-ar x %t/archive.a
RUN: diff %t/a.txt %t/extracted/a.txt
RUN: diff %t/b.txt %t/extracted/b.txt

59
llvm/test/tools/llvm-ar/insert-after.test
View File

@ -1,59 +0,0 @@
## Test inserting files after a file.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: touch %t3.txt
RUN: touch %t4.txt
# Insert one file:
RUN: rm -f %t-one.a
RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt
RUN: llvm-ar ra %t1.txt %t-one.a %t3.txt
RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
ONE: 1.txt
ONE-NEXT: 3.txt
ONE-NEXT: 2.txt
# Insert file at back:
RUN: rm -f %t-back.a
RUN: llvm-ar rc %t-back.a %t1.txt %t2.txt
RUN: llvm-ar ra %t2.txt %t-back.a %t3.txt
RUN: llvm-ar t %t-back.a | FileCheck %s --check-prefix=BACK
BACK: 1.txt
BACK-NEXT: 2.txt
BACK-NEXT: 3.txt
# Insert multiple files:
RUN: rm -f %t-multiple.a
RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt
RUN: llvm-ar ra %t1.txt %t-multiple.a %t4.txt %t3.txt
RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
MULTIPLE: 1.txt
MULTIPLE-NEXT: 4.txt
MULTIPLE-NEXT: 3.txt
MULTIPLE-NEXT: 2.txt
# Insert after invalid file:
RUN: rm -f %t-invalid.a
RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
RUN: not llvm-ar ra invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
ERROR: error: Insertion point not found.
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
# Insert file at the same position:
RUN: rm -f %t-position.a
RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar ra %t1.txt %t-position.a %t2.txt
RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
POSITION: 1.txt
POSITION-NEXT: 2.txt
POSITION-NEXT: 3.txt

59
llvm/test/tools/llvm-ar/insert-before.test
View File

@ -1,59 +0,0 @@
## Test inserting files before a file.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: touch %t3.txt
RUN: touch %t4.txt
# Insert one file:
RUN: rm -f %t-one.a
RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt
RUN: llvm-ar rb %t2.txt %t-one.a %t3.txt
RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
ONE: 1.txt
ONE-NEXT: 3.txt
ONE-NEXT: 2.txt
# Insert file at front:
RUN: rm -f %t-front.a
RUN: llvm-ar rc %t-front.a %t1.txt %t2.txt
RUN: llvm-ar rb %t1.txt %t-front.a %t3.txt
RUN: llvm-ar t %t-front.a | FileCheck %s --check-prefix=FRONT
FRONT: 3.txt
FRONT-NEXT: 1.txt
FRONT-NEXT: 2.txt
# Insert multiple files:
RUN: rm -f %t-multiple.a
RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt
RUN: llvm-ar rb %t2.txt %t-multiple.a %t4.txt %t3.txt
RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
MULTIPLE: 1.txt
MULTIPLE-NEXT: 4.txt
MULTIPLE-NEXT: 3.txt
MULTIPLE-NEXT: 2.txt
# Insert before an invalid file:
RUN: rm -f %t-invalid.a
RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
RUN: not llvm-ar rb invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
ERROR: error: Insertion point not found.
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
# Insert file at the same position:
RUN: rm -f %t-position.a
RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar rb %t3.txt %t-position.a %t2.txt
RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
POSITION: 1.txt
POSITION-NEXT: 2.txt
POSITION-NEXT: 3.txt

59
llvm/test/tools/llvm-ar/move-after.test
View File

@ -1,59 +0,0 @@
## Test moving files after a file.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: touch %t3.txt
RUN: touch %t4.txt
# Move one file:
RUN: rm -f %t-one.ar
RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar ma %t1.txt %t-one.a %t3.txt
RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
ONE: 1.txt
ONE-NEXT: 3.txt
ONE-NEXT: 2.txt
# Move file to back:
RUN: rm -f %t-back.ar
RUN: llvm-ar rc %t-back.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar ma %t2.txt %t-back.a %t1.txt
RUN: llvm-ar t %t-back.a | FileCheck %s --check-prefix=BACK
BACK: 2.txt
BACK-NEXT: 1.txt
BACK-NEXT: 3.txt
# Move multiple files:
RUN: rm -f %t-multiple.ar
RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt %t3.txt %t4.txt
RUN: llvm-ar ma %t1.txt %t-multiple.a %t4.txt %t3.txt
RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
MULTIPLE: 1.txt
MULTIPLE-NEXT: 3.txt
MULTIPLE-NEXT: 4.txt
MULTIPLE-NEXT: 2.txt
# Move after invalid file:
RUN: rm -f %t-invalid.ar
RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
RUN: not llvm-ar ma invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
ERROR: error: Insertion point not found.
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
# Move file to the same position:
RUN: rm -f %t-position.ar
RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar ma %t1.txt %t-position.a %t2.txt
RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
POSITION: 1.txt
POSITION-NEXT: 2.txt
POSITION-NEXT: 3.txt

69
llvm/test/tools/llvm-ar/move-before.test
View File

@ -1,69 +0,0 @@
## Test moving files after a file.
RUN: touch %t1.txt
RUN: touch %t2.txt
RUN: touch %t3.txt
RUN: touch %t4.txt
# Move one file:
RUN: rm -f %t-one.ar
RUN: llvm-ar rc %t-one.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar mb %t2.txt %t-one.a %t3.txt
RUN: llvm-ar t %t-one.a | FileCheck %s --check-prefix=ONE
ONE: 1.txt
ONE-NEXT: 3.txt
ONE-NEXT: 2.txt
# Move file to front:
RUN: rm -f %t-front.ar
RUN: llvm-ar rc %t-front.ar %t1.txt %t2.txt %t3.txt
RUN: llvm-ar mb %t1.txt %t-front.ar %t3.txt
RUN: llvm-ar t %t-front.ar | FileCheck %s --check-prefix=FRONT
FRONT: 3.txt
FRONT-NEXT: 1.txt
FRONT-NEXT: 2.txt
# Move multiple files:
RUN: rm -f %t-multiple.ar
RUN: llvm-ar rc %t-multiple.a %t1.txt %t2.txt %t3.txt %t4.txt
RUN: llvm-ar mb %t2.txt %t-multiple.a %t4.txt %t3.txt
RUN: llvm-ar t %t-multiple.a | FileCheck %s --check-prefix=MULTIPLE
MULTIPLE: 1.txt
MULTIPLE-NEXT: 3.txt
MULTIPLE-NEXT: 4.txt
MULTIPLE-NEXT: 2.txt
# Move before invalid file:
RUN: rm -f %t-invalid.ar
RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
RUN: not llvm-ar mb invalid.txt %t-invalid.a %t2.txt 2>&1 \
RUN: | FileCheck %s --check-prefix=ERROR
RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
ERROR: error: Insertion point not found.
INVALID: 1.txt
INVALID-NEXT: 2.txt
INVALID-NEXT: 3.txt
# Move file to the same position:
RUN: rm -f %t-position.ar
RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
RUN: llvm-ar mb %t3.txt %t-position.a %t2.txt
RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
POSITION: 1.txt
POSITION-NEXT: 2.txt
POSITION-NEXT: 3.txt
# Move file after itself:
RUN: rm -f %t-same.ar
RUN: llvm-ar rc %t-same.ar %t1.txt %t2.txt %t3.txt
RUN: llvm-ar mb %t2.txt %t-same.ar %t2.txt
RUN: llvm-ar t %t-same.ar | FileCheck %s --check-prefix=SAME
SAME: 1.txt
SAME-NEXT: 2.txt
SAME-NEXT: 3.txt

70
llvm/test/tools/llvm-ar/symtab.test
View File

@ -1,70 +0,0 @@
## Test the s and S modifiers. Build and do not build a symbol table.
# RUN: yaml2obj %s -o %t.o
# RUN: touch %t-other.txt
## Default:
# RUN: rm -f %t-default.a
# RUN: llvm-ar rc %t-default.a %t.o
# RUN: llvm-nm --print-armap %t-default.a \
# RUN: | FileCheck %s --check-prefix=SYMTAB
## Use a modifer:
# RUN: rm -f %t-symtab.a
# RUN: llvm-ar rcs %t-symtab.a %t.o
# RUN: llvm-nm --print-armap %t-symtab.a \
# RUN: | FileCheck %s --check-prefix=SYMTAB
# RUN: rm -f %t-no-symtab.a
# RUN: llvm-ar rcS %t-no-symtab.a %t.o
# RUN: llvm-nm --print-armap %t-no-symtab.a \
# RUN: | FileCheck %s --check-prefix=NO-SYMTAB
## Use both modifers:
# RUN: rm -f %t-symtab-last.a
# RUN: llvm-ar rcSs %t-symtab-last.a %t.o
# RUN: llvm-nm --print-armap %t-symtab-last.a \
# RUN: | FileCheck %s --check-prefix=SYMTAB
# RUN: rm -f %t-no-symtab-last.a
# RUN: llvm-ar rcsS %t-no-symtab-last.a %t.o
# RUN: llvm-nm --print-armap %t-no-symtab-last.a \
# RUN: | FileCheck %s --check-prefix=NO-SYMTAB
## Use an existing archive:
# RUN: rm -f %t-to-symtab.a
# RUN: llvm-ar rcS %t-to-symtab.a %t.o
# RUN: llvm-ar rs %t-to-symtab.a %t-other.txt
# RUN: llvm-nm --print-armap %t-to-symtab.a \
# RUN: | FileCheck %s --check-prefix=SYMTAB
# RUN: llvm-ar rs %t-to-symtab.a %t-other.txt
# RUN: llvm-nm --print-armap %t-to-symtab.a \
# RUN: | FileCheck %s --check-prefix=SYMTAB
# RUN: rm -f %t-to-no-symtab.a
# RUN: llvm-ar rcs %t-to-no-symtab.a %t.o
# RUN: llvm-ar rS %t-to-no-symtab.a %t-other.txt
# RUN: llvm-nm --print-armap %t-to-no-symtab.a \
# RUN: | FileCheck %s --check-prefix=NO-SYMTAB
# RUN: llvm-ar rS %t-to-no-symtab.a %t-other.txt
# RUN: llvm-nm --print-armap %t-to-no-symtab.a \
# RUN: | FileCheck %s --check-prefix=NO-SYMTAB
# SYMTAB: symbol in
# NO-SYMTAB-NOT: symbol in
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
Sections:
- Name: .text
Type: SHT_PROGBITS
Symbols:
- Name: symbol
Binding: STB_GLOBAL
Section: .text