From 3b5475c0f28935fe7b3a6c6b2505a645d5331134 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 10 Jul 2013 21:47:16 +0000 Subject: [PATCH] Move tests from test/Archive to test/Object. There is no lib/Archive anymore and some archive tests were in test/Archive and others in test/Object. Since archive is just one of the formats supported by lib/Object, test/Object is probably the best location. llvm-svn: 186038 --- llvm/test/Archive/README.txt | 24 ------------------ llvm/test/Archive/extract.ll | 16 ------------ llvm/test/Archive/lit.local.cfg | 1 - llvm/test/{Archive => Object/Inputs}/GNU.a | Bin llvm/test/{Archive => Object/Inputs}/IsNAN.o | Bin llvm/test/{Archive => Object/Inputs}/MacOSX.a | Bin llvm/test/{Archive => Object/Inputs}/SVR4.a | Bin llvm/test/{Archive => Object/Inputs}/evenlen | 0 llvm/test/{Archive => Object/Inputs}/oddlen | 0 .../Inputs}/very_long_bytecode_file_name.bc | Bin llvm/test/{Archive => Object/Inputs}/xpg4.a | Bin .../check_binary_output.ll | 2 +- llvm/test/{Archive => Object}/directory.ll | 0 llvm/test/Object/extract.ll | 16 ++++++++++++ llvm/test/{Archive => Object}/toc_GNU.ll | 2 +- llvm/test/{Archive => Object}/toc_MacOSX.ll | 2 +- llvm/test/{Archive => Object}/toc_SVR4.ll | 3 ++- llvm/test/{Archive => Object}/toc_xpg4.ll | 3 ++- 18 files changed, 23 insertions(+), 46 deletions(-) delete mode 100644 llvm/test/Archive/README.txt delete mode 100644 llvm/test/Archive/extract.ll delete mode 100644 llvm/test/Archive/lit.local.cfg rename llvm/test/{Archive => Object/Inputs}/GNU.a (100%) rename llvm/test/{Archive => Object/Inputs}/IsNAN.o (100%) rename llvm/test/{Archive => Object/Inputs}/MacOSX.a (100%) rename llvm/test/{Archive => Object/Inputs}/SVR4.a (100%) rename llvm/test/{Archive => Object/Inputs}/evenlen (100%) rename llvm/test/{Archive => Object/Inputs}/oddlen (100%) rename llvm/test/{Archive => Object/Inputs}/very_long_bytecode_file_name.bc (100%) rename llvm/test/{Archive => Object/Inputs}/xpg4.a (100%) rename llvm/test/{Archive => Object}/check_binary_output.ll (51%) rename llvm/test/{Archive => Object}/directory.ll (100%) create mode 100644 llvm/test/Object/extract.ll rename llvm/test/{Archive => Object}/toc_GNU.ll (85%) rename llvm/test/{Archive => Object}/toc_MacOSX.ll (85%) rename llvm/test/{Archive => Object}/toc_SVR4.ll (72%) rename llvm/test/{Archive => Object}/toc_xpg4.ll (71%) diff --git a/llvm/test/Archive/README.txt b/llvm/test/Archive/README.txt deleted file mode 100644 index 6021f4c0ae44..000000000000 --- a/llvm/test/Archive/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -test/Regression/Archive -======================= - -This directory contains various tests of llvm-ar and to ensure -compatibility reading other ar(1) formats. It also provides a basic -functionality test for these tools. - -There are four archives accompanying these tests: - -GNU.a - constructed on Linux with GNU ar -MacOSX.a - constructed on Mac OS X with its native BSD4.4 ar -SVR4.a - constructed on Solaris with /usr/ccs/bin/ar -xpg4.a - constructed on Solaris with /usr/xpg4/bin/ar - -Each type of test is run on each of these archive files. These archives each -contain four members: - -oddlen - a member with an odd lengthed name and content -evenlen - a member with an even lengthed name and content -IsNAN.o - a Linux native binary -very_long_bytecode_file_name.bc - LLVM bytecode file with really long name - -These files test different aspects of the archiver that should cause failures -in llvm-ar if regressions are introduced. diff --git a/llvm/test/Archive/extract.ll b/llvm/test/Archive/extract.ll deleted file mode 100644 index 5c0f508319b9..000000000000 --- a/llvm/test/Archive/extract.ll +++ /dev/null @@ -1,16 +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 extract bytecode members -; from various style archives. - -; RUN: llvm-ar p %p/GNU.a very_long_bytecode_file_name.bc | \ -; RUN: cmp -s %p/very_long_bytecode_file_name.bc - - -; RUN: llvm-ar p %p/MacOSX.a very_long_bytecode_file_name.bc | \ -; RUN: cmp -s %p/very_long_bytecode_file_name.bc - - -; RUN: llvm-ar p %p/SVR4.a very_long_bytecode_file_name.bc | \ -; RUN: cmp -s %p/very_long_bytecode_file_name.bc - - -; RUN: llvm-ar p %p/xpg4.a very_long_bytecode_file_name.bc |\ -; RUN: cmp -s %p/very_long_bytecode_file_name.bc - diff --git a/llvm/test/Archive/lit.local.cfg b/llvm/test/Archive/lit.local.cfg deleted file mode 100644 index 19eebc0ac7ac..000000000000 --- a/llvm/test/Archive/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = ['.ll', '.c', '.cpp'] diff --git a/llvm/test/Archive/GNU.a b/llvm/test/Object/Inputs/GNU.a similarity index 100% rename from llvm/test/Archive/GNU.a rename to llvm/test/Object/Inputs/GNU.a diff --git a/llvm/test/Archive/IsNAN.o b/llvm/test/Object/Inputs/IsNAN.o similarity index 100% rename from llvm/test/Archive/IsNAN.o rename to llvm/test/Object/Inputs/IsNAN.o diff --git a/llvm/test/Archive/MacOSX.a b/llvm/test/Object/Inputs/MacOSX.a similarity index 100% rename from llvm/test/Archive/MacOSX.a rename to llvm/test/Object/Inputs/MacOSX.a diff --git a/llvm/test/Archive/SVR4.a b/llvm/test/Object/Inputs/SVR4.a similarity index 100% rename from llvm/test/Archive/SVR4.a rename to llvm/test/Object/Inputs/SVR4.a diff --git a/llvm/test/Archive/evenlen b/llvm/test/Object/Inputs/evenlen similarity index 100% rename from llvm/test/Archive/evenlen rename to llvm/test/Object/Inputs/evenlen diff --git a/llvm/test/Archive/oddlen b/llvm/test/Object/Inputs/oddlen similarity index 100% rename from llvm/test/Archive/oddlen rename to llvm/test/Object/Inputs/oddlen diff --git a/llvm/test/Archive/very_long_bytecode_file_name.bc b/llvm/test/Object/Inputs/very_long_bytecode_file_name.bc similarity index 100% rename from llvm/test/Archive/very_long_bytecode_file_name.bc rename to llvm/test/Object/Inputs/very_long_bytecode_file_name.bc diff --git a/llvm/test/Archive/xpg4.a b/llvm/test/Object/Inputs/xpg4.a similarity index 100% rename from llvm/test/Archive/xpg4.a rename to llvm/test/Object/Inputs/xpg4.a diff --git a/llvm/test/Archive/check_binary_output.ll b/llvm/test/Object/check_binary_output.ll similarity index 51% rename from llvm/test/Archive/check_binary_output.ll rename to llvm/test/Object/check_binary_output.ll index 60ab5caac453..567f18e65ba5 100644 --- a/llvm/test/Archive/check_binary_output.ll +++ b/llvm/test/Object/check_binary_output.ll @@ -1,4 +1,4 @@ ; This is not an assembly file, this is just to run the test. ; The test verifies that llvm-ar produces a binary output. -;RUN: llvm-ar p %p/GNU.a very_long_bytecode_file_name.bc | cmp -s %p/very_long_bytecode_file_name.bc - +;RUN: llvm-ar p %p/Inputs/GNU.a very_long_bytecode_file_name.bc | cmp -s %p/Inputs/very_long_bytecode_file_name.bc - diff --git a/llvm/test/Archive/directory.ll b/llvm/test/Object/directory.ll similarity index 100% rename from llvm/test/Archive/directory.ll rename to llvm/test/Object/directory.ll diff --git a/llvm/test/Object/extract.ll b/llvm/test/Object/extract.ll new file mode 100644 index 000000000000..ab2bcc624bf2 --- /dev/null +++ b/llvm/test/Object/extract.ll @@ -0,0 +1,16 @@ +; This isn't really an assembly file, its just here to run the test. + +; This test just makes sure that llvm-ar can extract bytecode members +; from various style archives. + +; RUN: llvm-ar p %p/Inputs/GNU.a very_long_bytecode_file_name.bc | \ +; RUN: cmp -s %p/Inputs/very_long_bytecode_file_name.bc - + +; RUN: llvm-ar p %p/Inputs/MacOSX.a very_long_bytecode_file_name.bc | \ +; RUN: cmp -s %p/Inputs/very_long_bytecode_file_name.bc - + +; RUN: llvm-ar p %p/Inputs/SVR4.a very_long_bytecode_file_name.bc | \ +; RUN: cmp -s %p/Inputs/very_long_bytecode_file_name.bc - + +; RUN: llvm-ar p %p/Inputs/xpg4.a very_long_bytecode_file_name.bc |\ +; RUN: cmp -s %p/Inputs/very_long_bytecode_file_name.bc - diff --git a/llvm/test/Archive/toc_GNU.ll b/llvm/test/Object/toc_GNU.ll similarity index 85% rename from llvm/test/Archive/toc_GNU.ll rename to llvm/test/Object/toc_GNU.ll index 9ed7d8eb8cbd..510b7ed14187 100644 --- a/llvm/test/Archive/toc_GNU.ll +++ b/llvm/test/Object/toc_GNU.ll @@ -1,7 +1,7 @@ ;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/GNU.a | FileCheck %s +;RUN: llvm-ar t %p/Inputs/GNU.a | FileCheck %s ;CHECK: evenlen ;CHECK-NEXT: oddlen ;CHECK-NEXT: very_long_bytecode_file_name.bc diff --git a/llvm/test/Archive/toc_MacOSX.ll b/llvm/test/Object/toc_MacOSX.ll similarity index 85% rename from llvm/test/Archive/toc_MacOSX.ll rename to llvm/test/Object/toc_MacOSX.ll index 6dbc9d2ea4a6..3b8166c5e601 100644 --- a/llvm/test/Archive/toc_MacOSX.ll +++ b/llvm/test/Object/toc_MacOSX.ll @@ -1,7 +1,7 @@ ;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/MacOSX.a | FileCheck %s +;RUN: llvm-ar t %p/Inputs/MacOSX.a | FileCheck %s ;CHECK: __.SYMDEF SORTED ;CHECK-NEXT: evenlen ;CHECK-NEXT: oddlen diff --git a/llvm/test/Archive/toc_SVR4.ll b/llvm/test/Object/toc_SVR4.ll similarity index 72% rename from llvm/test/Archive/toc_SVR4.ll rename to llvm/test/Object/toc_SVR4.ll index d447b9219990..ecad5c8f0cc1 100644 --- a/llvm/test/Archive/toc_SVR4.ll +++ b/llvm/test/Object/toc_SVR4.ll @@ -1,7 +1,8 @@ ;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 -;RUN: llvm-ar t %p/SVR4.a | FileCheck %s +;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 diff --git a/llvm/test/Archive/toc_xpg4.ll b/llvm/test/Object/toc_xpg4.ll similarity index 71% rename from llvm/test/Archive/toc_xpg4.ll rename to llvm/test/Object/toc_xpg4.ll index fd875eebdaab..7af982da6daa 100644 --- a/llvm/test/Archive/toc_xpg4.ll +++ b/llvm/test/Object/toc_xpg4.ll @@ -1,7 +1,8 @@ ;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 -;RUN: llvm-ar t %p/xpg4.a | FileCheck %s +;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