diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2010-09-11 00:28:50 -0700 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-12 16:19:33 +0200 |
commit | 80d80ba6dd9e91cca471ce767c8032a0f0db4244 (patch) | |
tree | 8cff82a3d5fe20d2d4ad05f5546f35643457e6c2 /testsuite/tar.tests | |
parent | 819cacfd4597038840454ee743380fd70f836271 (diff) | |
download | busybox-w32-80d80ba6dd9e91cca471ce767c8032a0f0db4244.tar.gz busybox-w32-80d80ba6dd9e91cca471ce767c8032a0f0db4244.tar.bz2 busybox-w32-80d80ba6dd9e91cca471ce767c8032a0f0db4244.zip |
Fixed a couple of failing tar tests
The tar symlinks mode test is fixed similarly to the hardlinks
test in 0d7cb4cc, and the read-only test is skipped by
SKIP_KNOWN_BUGS.
Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'testsuite/tar.tests')
-rwxr-xr-x | testsuite/tar.tests | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/tar.tests b/testsuite/tar.tests index dd502c23d..f2f4e9348 100755 --- a/testsuite/tar.tests +++ b/testsuite/tar.tests | |||
@@ -91,15 +91,14 @@ mkdir input_dir | |||
91 | ln input_file input_dir | 91 | ln input_file input_dir |
92 | ln input_soft input_dir | 92 | ln input_soft input_dir |
93 | chmod 550 input_dir | 93 | chmod 550 input_dir |
94 | tar cf test.tar input_* | 94 | tar cf test.tar input_dir/* input_[fs]* |
95 | tar tvf test.tar | sed "s/.*[0-9] input/input/" | sort | 95 | tar tvf test.tar | sed "s/.*[0-9] input/input/" | sort |
96 | chmod 770 input_dir | 96 | chmod 770 input_dir |
97 | rm -rf input_* | 97 | rm -rf input_* |
98 | tar xf test.tar 2>&1 | 98 | tar xf test.tar 2>&1 |
99 | echo Ok: $? | 99 | echo Ok: $? |
100 | ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/" | 100 | ls -l . input_dir/* | grep "input_[fs]" | sed "s/\\(^[^ ]*\\) .* input/\\1 input/" |
101 | ' "\ | 101 | ' "\ |
102 | input_dir/ | ||
103 | input_dir/input_file | 102 | input_dir/input_file |
104 | input_dir/input_soft -> input_file | 103 | input_dir/input_soft -> input_file |
105 | input_file -> input_dir/input_file | 104 | input_file -> input_dir/input_file |
@@ -107,7 +106,6 @@ input_soft -> input_dir/input_soft | |||
107 | Ok: 0 | 106 | Ok: 0 |
108 | -rwxr----x input_dir/input_file | 107 | -rwxr----x input_dir/input_file |
109 | lrwxrwxrwx input_file | 108 | lrwxrwxrwx input_file |
110 | dr-xr-x--- input_dir | ||
111 | -rwxr----x input_file | 109 | -rwxr----x input_file |
112 | lrwxrwxrwx input_file | 110 | lrwxrwxrwx input_file |
113 | " \ | 111 | " \ |
@@ -129,6 +127,7 @@ Ok | |||
129 | "Ok\n" "" | 127 | "Ok\n" "" |
130 | SKIP= | 128 | SKIP= |
131 | 129 | ||
130 | test x"$SKIP_KNOWN_BUGS" = x"" && { | ||
132 | # Needs to be run under non-root for meaningful test | 131 | # Needs to be run under non-root for meaningful test |
133 | optional FEATURE_TAR_CREATE | 132 | optional FEATURE_TAR_CREATE |
134 | testing "tar writing into read-only dir" '\ | 133 | testing "tar writing into read-only dir" '\ |
@@ -153,6 +152,8 @@ dr-xr-x--- input_dir | |||
153 | " \ | 152 | " \ |
154 | "" "" | 153 | "" "" |
155 | SKIP= | 154 | SKIP= |
155 | } | ||
156 | |||
156 | 157 | ||
157 | cd .. && rm -rf tar.tempdir || exit 1 | 158 | cd .. && rm -rf tar.tempdir || exit 1 |
158 | 159 | ||