Skip to content

Commit a84b79e

Browse files
emilazytridge
authored andcommitted
Allow ls(1) to fail in test setup
This can happen when the tests are unable to `stat(2)` some files in `/etc`, `/bin`, or `/`, due to Unix permissions or other sandboxing. We still guard against serious errors, which use exit code 2.
1 parent d4c4f67 commit a84b79e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

testsuite/longdir.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ makepath "$longdir" || test_skipped "unable to create long directory"
1616
touch "$longdir/1" || test_skipped "unable to create files in long directory"
1717
date > "$longdir/1"
1818
if [ -r /etc ]; then
19-
ls -la /etc >"$longdir/2"
19+
ls -la /etc >"$longdir/2" || [ $? -eq 1 ]
2020
else
21-
ls -la / >"$longdir/2"
21+
ls -la / >"$longdir/2" || [ $? -eq 1 ]
2222
fi
2323
checkit "$RSYNC --delete -avH '$fromdir/' '$todir'" "$fromdir/" "$todir"
2424

testsuite/rsync.fns

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ hands_setup() {
195195
echo some data > "$fromdir/dir/subdir/foobar.baz"
196196
mkdir "$fromdir/dir/subdir/subsubdir"
197197
if [ -r /etc ]; then
198-
ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
198+
ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
199199
else
200-
ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
200+
ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
201201
fi
202202
mkdir "$fromdir/dir/subdir/subsubdir2"
203203
if [ -r /bin ]; then
204-
ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
204+
ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
205205
else
206-
ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
206+
ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
207207
fi
208208

209209
# echo testing head:

0 commit comments

Comments
 (0)