diff options
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/bunzip2.tests | 4 | ||||
-rwxr-xr-x | testsuite/bzcat.tests | 4 | ||||
-rw-r--r-- | testsuite/cp/cp-a-files-to-dir | 2 | ||||
-rw-r--r-- | testsuite/mv/mv-files-to-dir | 2 | ||||
-rw-r--r-- | testsuite/mv/mv-refuses-mv-dir-to-subdir | 2 | ||||
-rwxr-xr-x | testsuite/runtest | 11 |
6 files changed, 15 insertions, 10 deletions
diff --git a/testsuite/bunzip2.tests b/testsuite/bunzip2.tests index a7555aca9..7875cd1ae 100755 --- a/testsuite/bunzip2.tests +++ b/testsuite/bunzip2.tests | |||
@@ -517,8 +517,8 @@ if test "${0##*/}" = "bunzip2.tests"; then | |||
517 | if test1_bz2 | ${bb}bunzip2 >/dev/null \ | 517 | if test1_bz2 | ${bb}bunzip2 >/dev/null \ |
518 | && test "`test1_bz2 | ${bb}bunzip2 | md5sum`" = "61bbeee4be9c6f110a71447f584fda7b -" | 518 | && test "`test1_bz2 | ${bb}bunzip2 | md5sum`" = "61bbeee4be9c6f110a71447f584fda7b -" |
519 | then | 519 | then |
520 | echo "$unpack: test bz2 file: PASS" | 520 | echo "PASS: $unpack: test bz2 file" |
521 | else | 521 | else |
522 | echo "$unpack: test bz2 file: FAIL" | 522 | echo "FAIL: $unpack: test bz2 file" |
523 | fi | 523 | fi |
524 | fi | 524 | fi |
diff --git a/testsuite/bzcat.tests b/testsuite/bzcat.tests index 0bc744244..78d74f229 100755 --- a/testsuite/bzcat.tests +++ b/testsuite/bzcat.tests | |||
@@ -32,9 +32,9 @@ prep() { | |||
32 | check() { | 32 | check() { |
33 | eval $2 >t_actual 2>&1 | 33 | eval $2 >t_actual 2>&1 |
34 | if $ECHO -ne "$expected" | cmp - t_actual; then | 34 | if $ECHO -ne "$expected" | cmp - t_actual; then |
35 | echo "$1: PASS" | 35 | echo "PASS: $1" |
36 | else | 36 | else |
37 | echo "$1: FAIL" | 37 | echo "FAIL: $1" |
38 | fi | 38 | fi |
39 | } | 39 | } |
40 | 40 | ||
diff --git a/testsuite/cp/cp-a-files-to-dir b/testsuite/cp/cp-a-files-to-dir index abdbdf77d..b199ef9b9 100644 --- a/testsuite/cp/cp-a-files-to-dir +++ b/testsuite/cp/cp-a-files-to-dir | |||
@@ -3,7 +3,7 @@ echo file number two > file2 | |||
3 | ln -s file2 link1 | 3 | ln -s file2 link1 |
4 | mkdir dir1 | 4 | mkdir dir1 |
5 | # why??? | 5 | # why??? |
6 | #touch --date='Sat Jan 29 21:24:08 PST 2000' dir1/file3 | 6 | #TZ=UTC0 touch -d '2000-01-30 05:24:08' dir1/file3 |
7 | mkdir there | 7 | mkdir there |
8 | busybox cp -a file1 file2 link1 dir1 there | 8 | busybox cp -a file1 file2 link1 dir1 there |
9 | test -f there/file1 | 9 | test -f there/file1 |
diff --git a/testsuite/mv/mv-files-to-dir b/testsuite/mv/mv-files-to-dir index c8eaba88e..2b567f77f 100644 --- a/testsuite/mv/mv-files-to-dir +++ b/testsuite/mv/mv-files-to-dir | |||
@@ -2,7 +2,7 @@ echo file number one > file1 | |||
2 | echo file number two > file2 | 2 | echo file number two > file2 |
3 | ln -s file2 link1 | 3 | ln -s file2 link1 |
4 | mkdir dir1 | 4 | mkdir dir1 |
5 | touch --date='Sat Jan 29 21:24:08 PST 2000' dir1/file3 | 5 | TZ=UTC0 touch -d '2000-01-30 05:24:08' dir1/file3 |
6 | mkdir there | 6 | mkdir there |
7 | busybox mv file1 file2 link1 dir1 there | 7 | busybox mv file1 file2 link1 dir1 there |
8 | test -f there/file1 | 8 | test -f there/file1 |
diff --git a/testsuite/mv/mv-refuses-mv-dir-to-subdir b/testsuite/mv/mv-refuses-mv-dir-to-subdir index 7c572c4f8..3bad131a6 100644 --- a/testsuite/mv/mv-refuses-mv-dir-to-subdir +++ b/testsuite/mv/mv-refuses-mv-dir-to-subdir | |||
@@ -2,7 +2,7 @@ echo file number one > file1 | |||
2 | echo file number two > file2 | 2 | echo file number two > file2 |
3 | ln -s file2 link1 | 3 | ln -s file2 link1 |
4 | mkdir dir1 | 4 | mkdir dir1 |
5 | touch --date='Sat Jan 29 21:24:08 PST 2000' dir1/file3 | 5 | TZ=UTC0 touch -d '2000-01-30 05:24:08' dir1/file3 |
6 | mkdir there | 6 | mkdir there |
7 | busybox mv file1 file2 link1 dir1 there | 7 | busybox mv file1 file2 link1 dir1 there |
8 | test -f there/file1 | 8 | test -f there/file1 |
diff --git a/testsuite/runtest b/testsuite/runtest index 2d60591fb..5560f7bc2 100755 --- a/testsuite/runtest +++ b/testsuite/runtest | |||
@@ -120,12 +120,17 @@ fi | |||
120 | 120 | ||
121 | # Populate a directory with links to all busybox applets | 121 | # Populate a directory with links to all busybox applets |
122 | 122 | ||
123 | # Note: if $LINKSDIR/applet exists, we do not overwrite it. | ||
124 | # Useful if one wants to run tests against a standard utility, not an applet. | ||
125 | LINKSDIR="$bindir/runtest-tempdir-links" | 123 | LINKSDIR="$bindir/runtest-tempdir-links" |
126 | #rm -rf "$LINKSDIR" 2>/dev/null | 124 | |
125 | # Comment this line out if you have put a different binary in $LINKSDIR | ||
126 | # (say, a "standard" tool's binary) in order to run tests against it: | ||
127 | rm -rf "$LINKSDIR" 2>/dev/null | ||
128 | |||
127 | mkdir "$LINKSDIR" 2>/dev/null | 129 | mkdir "$LINKSDIR" 2>/dev/null |
128 | for i in $implemented; do | 130 | for i in $implemented; do |
131 | # Note: if $LINKSDIR/applet exists, we do not overwrite it. | ||
132 | # Useful if one wants to run tests against a standard utility, | ||
133 | # not an applet. | ||
129 | ln -s "$bindir/busybox" "$LINKSDIR/$i" 2>/dev/null | 134 | ln -s "$bindir/busybox" "$LINKSDIR/$i" 2>/dev/null |
130 | done | 135 | done |
131 | 136 | ||