[BusyBox-cvs] busybox/testsuite/cp cp-a-files-to-dir, 1.1, 1.2 cp-a-preserves-links, 1.1, 1.2 cp-d-files-to-dir, 1.1, 1.2 cp-does-not-copy-unreadable-file, 1.1, 1.2 cp-preserves-links, 1.2, 1.3

[Erik Andersen]

Update of /var/cvs/busybox/testsuite/cp
In directory nail:/tmp/cvs-serv13250/testsuite/cp

Modified Files:
	cp-a-files-to-dir cp-a-preserves-links cp-d-files-to-dir 
	cp-does-not-copy-unreadable-file cp-preserves-links 
Log Message:
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


Index: cp-does-not-copy-unreadable-file
===================================================================
RCS file: /var/cvs/busybox/testsuite/cp/cp-does-not-copy-unreadable-file,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/cp-does-not-copy-unreadable-file	11 Dec 2001 16:43:48 -0000	1.1
+++ b/cp-does-not-copy-unreadable-file	6 Apr 2004 11:09:48 -0000	1.2
@@ -1,4 +1,6 @@
 touch foo
 chmod a-r foo
+set +e
 busybox cp foo bar
+set -e
 test ! -f bar

Index: cp-preserves-links
===================================================================
RCS file: /var/cvs/busybox/testsuite/cp/cp-preserves-links,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/cp-preserves-links	5 Apr 2004 18:46:24 -0000	1.2
+++ b/cp-preserves-links	6 Apr 2004 11:09:48 -0000	1.3
@@ -2,4 +2,4 @@
 ln -s foo bar
 busybox cp -d bar baz
 test -L baz
-test `readlink baz` = "foo"
+test xfoo = x`readlink baz`

Index: cp-d-files-to-dir
===================================================================
RCS file: /var/cvs/busybox/testsuite/cp/cp-d-files-to-dir,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/cp-d-files-to-dir	5 Apr 2004 18:46:24 -0000	1.1
+++ b/cp-d-files-to-dir	6 Apr 2004 11:09:48 -0000	1.2
@@ -7,5 +7,5 @@
 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`

Index: cp-a-files-to-dir
===================================================================
RCS file: /var/cvs/busybox/testsuite/cp/cp-a-files-to-dir,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/cp-a-files-to-dir	5 Apr 2004 18:46:24 -0000	1.1
+++ b/cp-a-files-to-dir	6 Apr 2004 11:09:48 -0000	1.2
@@ -8,7 +8,7 @@
 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

Index: cp-a-preserves-links
===================================================================
RCS file: /var/cvs/busybox/testsuite/cp/cp-a-preserves-links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/cp-a-preserves-links	5 Apr 2004 18:46:24 -0000	1.1
+++ b/cp-a-preserves-links	6 Apr 2004 11:09:48 -0000	1.2
@@ -2,4 +2,4 @@
 ln -s foo bar
 busybox cp -a bar baz
 test -L baz
-test `readlink baz` = "foo"
+test xfoo = x`readlink baz`