* Undo previous commit that breaks the test.

* Correct the test to work when srcdir == objdir.

NOTE: Since multiple tests run from the same source archive and llvm-ranlib
changes the archive, these tests MUST work on a copy of the archive or else
this test corrupts the archive file subsequent tests or subsequent runs of
the test suite.

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

diff --git a/test/Archive/ranlib_MacOSX.ll b/test/Archive/ranlib_MacOSX.ll
index bf42aad380e282ed6f884c6f3fdb5611538639f6..c6fa661f192178a894e9f88821beba0799daed6f 100644 (file)
Binary files a/test/Archive/ranlib_MacOSX.ll and b/test/Archive/ranlib_MacOSX.ll differ

diff --git a/test/Archive/ranlib_SVR4.ll b/test/Archive/ranlib_SVR4.ll
index 6874662a12ff5cb7faf0d6ca4a0f8db0759fa849..137bad7fb6a95111357856b1c8418f1f17b240b4 100644 (file)
--- a/test/Archive/ranlib_SVR4.ll
+++ b/test/Archive/ranlib_SVR4.ll
@@ -1,8 +1,9 @@
 ;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 symbol table for
 ;SVR4 style archives
-;RUN: llvm-ranlib %p/SVR4.a
-;RUN: llvm-ar t %p/SVR4.a > %t1
+;RUN: cp %p/SVR4.a SVR4_copy.a
+;RUN: llvm-ranlib SVR4_copy.a
+;RUN: llvm-ar t SVR4_copy.a > %t1
 ;RUN: sed -e '/^;.*/d' %s >%t2
 ;RUN: diff %t2 %t1
 evenlen

diff --git a/test/Archive/ranlib_xpg4.ll b/test/Archive/ranlib_xpg4.ll
index ef363af8048f0c2d5201ba4fb4b6b46411887c2d..2d133e46eab94f9093ed2735b11a067d8dcae9d4 100644 (file)
--- a/test/Archive/ranlib_xpg4.ll
+++ b/test/Archive/ranlib_xpg4.ll
@@ -1,8 +1,9 @@
 ;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 symbol table for
 ;xpg4 style archives
-;RUN: llvm-ranlib %p/xpg4.a
-;RUN: llvm-ar t %p/xpg4.a > %t1
+;RUN: cp %p/xpg4.a xpg4_copy.a
+;RUN: llvm-ranlib xpg4_copy.a
+;RUN: llvm-ar t xpg4_copy.a > %t1
 ;RUN: sed -e '/^;.*/d' %s >%t2
 ;RUN: diff %t2 %t1
 evenlen