From 650fe63467e693990cf357c51b74db3278088a56 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 6 Apr 2004 11:10:30 +0000
Subject: Kill off the old 'tests' stuff.  Write a ton of new tests for the
 'testsuite' dir.  Fix a bunch of broken tests.  Fix the testsuite 'runtest'
 script so it actually reports all failures and provides meaningful feedback. 
 -Erik

---
 testsuite/cp/cp-a-files-to-dir                | 8 ++++----
 testsuite/cp/cp-a-preserves-links             | 2 +-
 testsuite/cp/cp-d-files-to-dir                | 4 ++--
 testsuite/cp/cp-does-not-copy-unreadable-file | 2 ++
 testsuite/cp/cp-preserves-links               | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'testsuite/cp')

diff --git a/testsuite/cp/cp-a-files-to-dir b/testsuite/cp/cp-a-files-to-dir
index 8fb3c201d..39f8f8103 100644
--- a/testsuite/cp/cp-a-files-to-dir
+++ b/testsuite/cp/cp-a-files-to-dir
@@ -8,7 +8,7 @@ busybox cp -a file1 file2 link1 dir1 there
 test -f there/file1
 test -f there/file2
 test ! -s there/dir1/file3
-test -l there/link1
-test `readlink there/link1` = "file2"
-test ! file3 -ot there/dir1/file3
-test ! file3 -nt there/dir1/file3
+test -L there/link1
+test xfile2 = x`readlink there/link1`
+test ! dir1/file3 -ot there/dir1/file3
+test ! dir1/file3 -nt there/dir1/file3
diff --git a/testsuite/cp/cp-a-preserves-links b/testsuite/cp/cp-a-preserves-links
index aae8313c6..0c0cd9653 100644
--- a/testsuite/cp/cp-a-preserves-links
+++ b/testsuite/cp/cp-a-preserves-links
@@ -2,4 +2,4 @@ touch foo
 ln -s foo bar
 busybox cp -a bar baz
 test -L baz
-test `readlink baz` = "foo"
+test xfoo = x`readlink baz`
diff --git a/testsuite/cp/cp-d-files-to-dir b/testsuite/cp/cp-d-files-to-dir
index 9407ead00..9571a567e 100644
--- a/testsuite/cp/cp-d-files-to-dir
+++ b/testsuite/cp/cp-d-files-to-dir
@@ -7,5 +7,5 @@ busybox cp -d file1 file2 file3 link1 there
 test -f there/file1
 test -f there/file2
 test ! -s there/file3
-test -l there/link1
-test `readlink there/link1` = "file2"
+test -L there/link1
+test xfile2 = x`readlink there/link1`
diff --git a/testsuite/cp/cp-does-not-copy-unreadable-file b/testsuite/cp/cp-does-not-copy-unreadable-file
index 68c576727..ce11bfab0 100644
--- a/testsuite/cp/cp-does-not-copy-unreadable-file
+++ b/testsuite/cp/cp-does-not-copy-unreadable-file
@@ -1,4 +1,6 @@
 touch foo
 chmod a-r foo
+set +e
 busybox cp foo bar
+set -e
 test ! -f bar
diff --git a/testsuite/cp/cp-preserves-links b/testsuite/cp/cp-preserves-links
index d3223b132..301dc5fd8 100644
--- a/testsuite/cp/cp-preserves-links
+++ b/testsuite/cp/cp-preserves-links
@@ -2,4 +2,4 @@ touch foo
 ln -s foo bar
 busybox cp -d bar baz
 test -L baz
-test `readlink baz` = "foo"
+test xfoo = x`readlink baz`
-- 
cgit v1.2.3