diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-11-07 18:30:21 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-11-07 18:30:21 +0000 |
| commit | 5080b233faead1b7e9b1321d2897c204bcbab3b3 (patch) | |
| tree | b6c053b787c3292568896dfd02b14474b810eb57 | |
| parent | cfc15df5f1669a26c805b91c229805ffe012ca5f (diff) | |
| download | bubblewrap-5080b233faead1b7e9b1321d2897c204bcbab3b3.tar.gz | |
test-run: Don't rely on df supporting the --output=size option
df --output was new in coreutils 8.21 (2013), and non-GNU
implementations like busybox df don't have it.
This avoids a test failure in Steam Runtime 1 'scout', which is based
on Ubuntu 12.04 (2012). It'll also be helpful for anyone maintaining
an OS with non-GNU shell utilities.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rwxr-xr-x | tests/test-run.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh index 4aab01d..a08998b 100755 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -411,7 +411,7 @@ if test -n "${bwrap_is_suid:-}"; then assert_not_reached "Should not allow --size --tmpfs when setuid" fi echo "ok - --size --tmpfs is not allowed when setuid" -else +elif df --output=size --block-size=1K "$(pwd -P)" >/dev/null 2>/dev/null; then $RUN \ --size 1048576 --tmpfs "$(pwd -P)" \ df --output=size --block-size=1K "$(pwd -P)" > dir-size @@ -433,6 +433,11 @@ else df --output=size --block-size=1K "$(pwd -P)" > dir-size assert_file_has_content dir-size '^ *1024$' echo "ok - tmpfs has expected size" +else + $RUN --size 1048576 --tmpfs "$(pwd -P)" true + $RUN --perms 01777 --size 1048576 --tmpfs "$(pwd -P)" true + $RUN --size 1048576 --perms 01777 --tmpfs "$(pwd -P)" true + echo "ok # SKIP df is too old, cannot test --size --tmpfs fully" fi $RUN \ |