Use grep instead of sed because on Solaris sed doesn't copy null bytes and

it needs to in order for the bug in MacOSX archives to be tested correctly.

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

diff --git a/test/Archive/ranlib_GNU.ll b/test/Archive/ranlib_GNU.ll
index ac63989c79b7c579c0c41a97cd35d71ce054bf6e..289303a585dbee60268132754378d66f25d7b8e6 100644 (file)
--- a/test/Archive/ranlib_GNU.ll
+++ b/test/Archive/ranlib_GNU.ll
@@ -4,7 +4,7 @@
 ;RUN: cp %p/GNU.a %t.GNU.a
 ;RUN: llvm-ranlib %t.GNU.a
 ;RUN: llvm-ar t %t.GNU.a > %t1
 ;RUN: cp %p/GNU.a %t.GNU.a
 ;RUN: llvm-ranlib %t.GNU.a
 ;RUN: llvm-ar t %t.GNU.a > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen

diff --git a/test/Archive/ranlib_MacOSX.ll b/test/Archive/ranlib_MacOSX.ll
index dda2f0b36e1a4c0697ea74efba6adebb75bad582..50fe5cd38a11f277e5c096e975d76991380e35f5 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 a7da63d0318d4aef3740878fa2d3cc42e9e52c5a..e1cd79b8ddeeff5ca1542b81b7fc3df969f88b33 100644 (file)
--- a/test/Archive/ranlib_SVR4.ll
+++ b/test/Archive/ranlib_SVR4.ll
@@ -4,7 +4,7 @@
 ;RUN: cp %p/SVR4.a %t.SVR4.a
 ;RUN: llvm-ranlib %t.SVR4.a
 ;RUN: llvm-ar t %t.SVR4.a > %t1
 ;RUN: cp %p/SVR4.a %t.SVR4.a
 ;RUN: llvm-ranlib %t.SVR4.a
 ;RUN: llvm-ar t %t.SVR4.a > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen

diff --git a/test/Archive/ranlib_xpg4.ll b/test/Archive/ranlib_xpg4.ll
index 9f8aca0836d1d500884d001fa64297277e3944a4..f36c93c6c941c1462af8c716cc1e089e556d9ddd 100644 (file)
--- a/test/Archive/ranlib_xpg4.ll
+++ b/test/Archive/ranlib_xpg4.ll
@@ -4,7 +4,7 @@
 ;RUN: cp %p/xpg4.a %t.xpg4.a
 ;RUN: llvm-ranlib %t.xpg4.a
 ;RUN: llvm-ar t %t.xpg4.a > %t1
 ;RUN: cp %p/xpg4.a %t.xpg4.a
 ;RUN: llvm-ranlib %t.xpg4.a
 ;RUN: llvm-ar t %t.xpg4.a > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen

diff --git a/test/Archive/toc_GNU.ll b/test/Archive/toc_GNU.ll
index f1595635274514f3b6e73cd2a503698d7fa455df..3aeded259aa374adb15907e87dd2450794cac1f8 100644 (file)
--- a/test/Archive/toc_GNU.ll
+++ b/test/Archive/toc_GNU.ll
@@ -2,7 +2,7 @@
 ;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 > %t1
 ;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 > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen

diff --git a/test/Archive/toc_MacOSX.ll b/test/Archive/toc_MacOSX.ll
index efc2224ef2ed78fa5e8d6a49a68f178a22dcba29..331816bddb098d81046382b9576e65a60039c4aa 100644 (file)
Binary files a/test/Archive/toc_MacOSX.ll and b/test/Archive/toc_MacOSX.ll differ

diff --git a/test/Archive/toc_SVR4.ll b/test/Archive/toc_SVR4.ll
index 589d34c52b70bf2d68421191ed7e91c776bbd63b..9f8bdba207d408d0828156c093f0c71ecc316c91 100644 (file)
--- a/test/Archive/toc_SVR4.ll
+++ b/test/Archive/toc_SVR4.ll
@@ -2,7 +2,7 @@
 ;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 > %t1
 ;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 > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen

diff --git a/test/Archive/toc_xpg4.ll b/test/Archive/toc_xpg4.ll
index 1415421dd38e0806b90175697bc64e510466896e..f2984e27d7e7fa69ffbfc26563907f545f6cb112 100644 (file)
--- a/test/Archive/toc_xpg4.ll
+++ b/test/Archive/toc_xpg4.ll
@@ -2,7 +2,7 @@
 ;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 > %t1
 ;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 > %t1

-;RUN: sed -e '/^;.*/d' %s >%t2
+;RUN: grep -v '^;' %s >%t2

 ;RUN: diff %t2 %t1
 evenlen
 oddlen
 ;RUN: diff %t2 %t1
 evenlen
 oddlen