From 12fa02841ca1f2115d38aadd3e5d7afe08c65337 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 11 Jul 2013 13:44:10 +0000
Subject: [PATCH] Merge these tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186084 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Object/archive-toc.test | 16 ++++++++++++++++
 test/Object/toc_GNU.ll       |  8 --------
 test/Object/toc_MacOSX.ll    |  9 ---------
 test/Object/toc_SVR4.ll      |  9 ---------
 test/Object/toc_xpg4.ll      |  9 ---------
 5 files changed, 16 insertions(+), 35 deletions(-)
 create mode 100644 test/Object/archive-toc.test
 delete mode 100644 test/Object/toc_GNU.ll
 delete mode 100644 test/Object/toc_MacOSX.ll
 delete mode 100644 test/Object/toc_SVR4.ll
 delete mode 100644 test/Object/toc_xpg4.ll

diff --git a/test/Object/archive-toc.test b/test/Object/archive-toc.test
new file mode 100644
index 00000000000..e11dac5d018
--- /dev/null
+++ b/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/test/Object/toc_GNU.ll b/test/Object/toc_GNU.ll
deleted file mode 100644
index 510b7ed1418..00000000000
--- a/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/test/Object/toc_MacOSX.ll b/test/Object/toc_MacOSX.ll
deleted file mode 100644
index 3b8166c5e60..00000000000
--- a/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/test/Object/toc_SVR4.ll b/test/Object/toc_SVR4.ll
deleted file mode 100644
index ecad5c8f0cc..00000000000
--- a/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/test/Object/toc_xpg4.ll b/test/Object/toc_xpg4.ll
deleted file mode 100644
index 7af982da6da..00000000000
--- a/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