Merge these tests.

llvm-svn: 186084

diff --git a/llvm/test/Object/archive-toc.test b/llvm/test/Object/archive-toc.test
new file mode 100644 (file)
index 0000000..e11dac5
--- /dev/null
+++ b/llvm/test/Object/archive-toc.test
@@ -0,0 +1,16 @@
+Test reading an archive created by gnu ar
+RUN: llvm-ar t %p/Inputs/GNU.a | FileCheck %s
+
+Test reading an archive createdy by Mac OS X ar
+RUN: llvm-ar t %p/Inputs/MacOSX.a | FileCheck %s
+
+Test reading an archive created on Solaris by /usr/ccs/bin/ar
+RUN: llvm-ar t %p/Inputs/SVR4.a | FileCheck %s
+
+Test reading an archive created on Solaris by /usr/xpg4/bin/ar
+RUN: llvm-ar t %p/Inputs/xpg4.a | FileCheck %s
+
+CHECK:      evenlen
+CHECK-NEXT: oddlen
+CHECK-NEXT: very_long_bytecode_file_name.bc
+CHECK-NEXT: IsNAN.o

diff --git a/llvm/test/Object/toc_GNU.ll b/llvm/test/Object/toc_GNU.ll
deleted file mode 100644 (file)
index 510b7ed..0000000
--- a/llvm/test/Object/toc_GNU.ll
+++ /dev/null
@@ -1,8 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can generate a table of contents for
-;GNU style archives
-;RUN: llvm-ar t %p/Inputs/GNU.a | FileCheck %s
-;CHECK:      evenlen
-;CHECK-NEXT: oddlen
-;CHECK-NEXT: very_long_bytecode_file_name.bc
-;CHECK-NEXT: IsNAN.o

diff --git a/llvm/test/Object/toc_MacOSX.ll b/llvm/test/Object/toc_MacOSX.ll
deleted file mode 100644 (file)
index 3b8166c..0000000
--- a/llvm/test/Object/toc_MacOSX.ll
+++ /dev/null
@@ -1,9 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can generate a table of contents for
-;MacOSX style archives
-;RUN: llvm-ar t %p/Inputs/MacOSX.a | FileCheck %s
-;CHECK:      __.SYMDEF SORTED
-;CHECK-NEXT: evenlen
-;CHECK-NEXT: oddlen
-;CHECK-NEXT: very_long_bytecode_file_name.bc
-;CHECK-NEXT: IsNAN.o

diff --git a/llvm/test/Object/toc_SVR4.ll b/llvm/test/Object/toc_SVR4.ll
deleted file mode 100644 (file)
index ecad5c8..0000000
--- a/llvm/test/Object/toc_SVR4.ll
+++ /dev/null
@@ -1,9 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can generate a table of contents for
-;SVR4 style archives
-;This archive was created on Solaris with /usr/ccs/bin/ar
-;RUN: llvm-ar t %p/Inputs/SVR4.a | FileCheck %s
-;CHECK:      evenlen
-;CHECK-NEXT: oddlen
-;CHECK-NEXT: very_long_bytecode_file_name.bc
-;CHECK-NEXT: IsNAN.o

diff --git a/llvm/test/Object/toc_xpg4.ll b/llvm/test/Object/toc_xpg4.ll
deleted file mode 100644 (file)
index 7af982d..0000000
--- a/llvm/test/Object/toc_xpg4.ll
+++ /dev/null
@@ -1,9 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can generate a table of contents for
-;xpg4 style archives
-;This archive was created on Solaris with /usr/xpg4/bin/ar
-;RUN: llvm-ar t %p/Inputs/xpg4.a | FileCheck %s
-CHECK:      evenlen
-CHECK-NEXT: oddlen
-CHECK-NEXT: very_long_bytecode_file_name.bc
-CHECK-NEXT: IsNAN.o