Reapply [llvm-ar][test] Add to MRI test coverage

This reapplies 363232 without mri-utf8.test due to failing on Darwin.

Differential Revision: https://reviews.llvm.org/D63197

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@366201 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-ar/mri-addlib.test b/test/tools/llvm-ar/mri-addlib.test
new file mode 100644 (file)
index 0000000..c297653
--- /dev/null
+++ b/test/tools/llvm-ar/mri-addlib.test
@@ -0,0 +1,45 @@
+## Test the ADDLIB MRI command.\r
+\r
+# RUN: rm -rf %t && mkdir -p %t\r
+# RUN: yaml2obj %s -o %t/f.o\r
+# RUN: llvm-ar r %t/f.a %t/f.o\r
+\r
+## Merge contents of archives.\r
+# RUN: echo "CREATE %t/addlib.a" > %t/addlib.mri\r
+# RUN: echo "ADDLIB %t/f.a" >> %t/addlib.mri\r
+# RUN: echo "SAVE" >> %t/addlib.mri\r
+# RUN: llvm-ar -M < %t/addlib.mri\r
+# RUN: llvm-nm --print-armap %t/addlib.a | FileCheck --check-prefix=SYMS %s\r
+# RUN: llvm-ar t %t/addlib.a | FileCheck --check-prefix=FILES %s\r
+\r
+# SYMS: f in {{.*}}\r
+# FILES: f.o\r
+\r
+## ADDLIB with non-archive file.\r
+# RUN: echo "CREATE %t/badlib.a" > %t/badlib.mri\r
+# RUN: echo "ADDLIB %s" >> %t/badlib.mri\r
+# RUN: echo "SAVE" >> %t/badlib.mri\r
+# RUN: not llvm-ar -M < %t/badlib.mri 2>&1 | FileCheck --check-prefix=PARSE %s\r
+# RUN: not ls %t/badlib.a\r
+\r
+# PARSE: Could not parse library\r
+\r
+## No create command.\r
+# RUN: echo "ADDLIB %t/f.a"  > %t/nocreate.mri\r
+# RUN: echo "SAVE" >> %t/nocreate.mri\r
+# RUN: not llvm-ar -M < %t/nocreate.mri\r
+\r
+--- !ELF\r
+FileHeader:\r
+  Class:   ELFCLASS64\r
+  Data:    ELFDATA2LSB\r
+  Type:    ET_REL\r
+  Machine: EM_X86_64\r
+Sections:\r
+  - Name: .text\r
+    Type: SHT_PROGBITS\r
+Symbols:\r
+    - Name:    f\r
+      Binding: STB_GLOBAL\r
+      Section: .text\r
+...\r

diff --git a/test/tools/llvm-ar/mri-addmod.test b/test/tools/llvm-ar/mri-addmod.test
new file mode 100644 (file)
index 0000000..2b6e4dc
--- /dev/null
+++ b/test/tools/llvm-ar/mri-addmod.test
@@ -0,0 +1,27 @@
+## Test the ADDMOD MRI command.\r
+\r
+# RUN: rm -rf %t && mkdir -p %t\r
+# RUN: yaml2obj %s -o %t/f.o\r
+\r
+# RUN: echo "CREATE %t/addmod.a" > %t/addmod.mri\r
+# RUN: echo "ADDMOD %t/f.o" >> %t/addmod.mri\r
+# RUN: echo "SAVE" >> %t/addmod.mri\r
+# RUN: llvm-ar -M < %t/addmod.mri\r
+# RUN: llvm-nm --print-armap %t/addmod.a | FileCheck %s\r
+\r
+# CHECK: f in f.o\r
+\r
+--- !ELF\r
+FileHeader:\r
+  Class:   ELFCLASS64\r
+  Data:    ELFDATA2LSB\r
+  Type:    ET_REL\r
+  Machine: EM_X86_64\r
+Sections:\r
+  - Name: .text\r
+    Type: SHT_PROGBITS\r
+Symbols:\r
+    - Name:    f\r
+      Binding: STB_GLOBAL\r
+      Section: .text\r
+...\r

diff --git a/test/tools/llvm-ar/mri-comments.test b/test/tools/llvm-ar/mri-comments.test
new file mode 100644 (file)
index 0000000..f5fa617
--- /dev/null
+++ b/test/tools/llvm-ar/mri-comments.test
@@ -0,0 +1,19 @@
+# Test different MRI comment formats and white space.\r
+\r
+RUN: rm -rf %t && mkdir -p %t\r
+RUN: yaml2obj %S/Inputs/elf.yaml -o %t/elf.o\r
+\r
+RUN: echo "create %t/mri.ar;comment" > %t/script.mri\r
+RUN: echo "addmod %t/elf.o * comment" >> %t/script.mri\r
+RUN: echo "; comment" >> %t/script.mri\r
+RUN: echo " ;comment" >> %t/script.mri\r
+RUN: echo "* comment" >> %t/script.mri\r
+RUN: echo " *comment" >> %t/script.mri\r
+RUN: echo "" >> %t/script.mri\r
+RUN: echo " " >> %t/script.mri\r
+RUN: echo " save" >> %t/script.mri\r
+\r
+RUN: llvm-ar -M < %t/script.mri\r
+RUN: llvm-ar t %t/mri.ar | FileCheck %s\r
+\r
+CHECK: elf.o\r

diff --git a/test/tools/llvm-ar/mri-end.test b/test/tools/llvm-ar/mri-end.test
new file mode 100644 (file)
index 0000000..db4abce
--- /dev/null
+++ b/test/tools/llvm-ar/mri-end.test
@@ -0,0 +1,48 @@
+# The END MRI command is optional. Scripts that omit\r
+# or include END should be handled by llvm-ar.\r
+RUN: rm -rf %t && mkdir -p %t\r
+\r
+# Empty File\r
+RUN: yaml2obj %S/Inputs/elf.yaml -o %t/elf.o\r
+\r
+RUN: touch %t/empty.mri\r
+RUN: llvm-ar -M < %t/empty.mri\r
+\r
+RUN: echo "END" > %t/empty-end.mri\r
+RUN: llvm-ar -M < %t/empty-end.mri\r
+\r
+# Comment only\r
+RUN: echo "; a comment" > %t/comment.mri\r
+RUN: llvm-ar -M < %t/comment.mri\r
+\r
+RUN: echo "; a comment" > %t/comment-end.mri\r
+RUN: echo "END" > %t/comment-end.mri\r
+RUN: llvm-ar -M < %t/comment-end.mri\r
+\r
+# Without Save\r
+RUN: echo "create %t/mri.ar" > %t/no-save.mri\r
+RUN: echo "addmod %t/elf.o" >> %t/no-save.mri\r
+RUN: llvm-ar -M < %t/no-save.mri\r
+RUN: test ! -e %t/mri.ar\r
+\r
+RUN: echo "create %t/mri.ar" > %t/no-save-end.mri\r
+RUN: echo "addmod %t/elf.o" >> %t/no-save-end.mri\r
+RUN: echo "END" > %t/no-save-end.mri\r
+RUN: llvm-ar -M < %t/no-save-end.mri\r
+RUN: test ! -e %t/mri.ar\r
+\r
+# With Save\r
+RUN: echo "create %t/mri.ar" > %t/save.mri\r
+RUN: echo "addmod %t/elf.o" >> %t/save.mri\r
+RUN: echo "save" >> %t/save.mri\r
+RUN: llvm-ar -M < %t/save.mri\r
+RUN: llvm-ar t %t/mri.ar | FileCheck %s\r
+\r
+RUN: echo "create %t/mri.ar" > %t/save-end.mri\r
+RUN: echo "addmod %t/elf.o" >> %t/save-end.mri\r
+RUN: echo "save" >> %t/save-end.mri\r
+RUN: echo "END" > %t/no-save-end.mri\r
+RUN: llvm-ar -M < %t/save-end.mri\r
+RUN: llvm-ar t %t/mri.ar | FileCheck %s\r
+\r
+CHECK: elf.o\r