diff options
| author | Elliott Hughes <enh@google.com> | 2023-12-12 15:12:19 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2023-12-12 15:12:28 +0000 |
| commit | 88d7fa68f374bb7b734f65808b10b01e5275c212 (patch) | |
| tree | 916cb84b500e89eb5359c51c206cd0c463db507d | |
| parent | bbc3db479f7ce3491f3c1d7e750e196283038bc3 (diff) | |
| parent | eccdfdf8e7ef9239c03e90a5cf38e3a1b285bb76 (diff) | |
| download | toybox-88d7fa68f374bb7b734f65808b10b01e5275c212.tar.gz | |
Upgrade toybox to eccdfdf8e7ef9239c03e90a5cf38e3a1b285bb76
This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update toybox
For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
Test: TreeHugger
Change-Id: Ie9f1e1c2ddccd8c2b9e5010c70a880485da04c0c
| -rw-r--r-- | METADATA | 4 | ||||
| -rwxr-xr-x | tests/tar.test | 19 |
2 files changed, 13 insertions, 10 deletions
@@ -9,12 +9,12 @@ third_party { last_upgrade_date { year: 2023 month: 12 - day: 6 + day: 12 } homepage: "https://landley.net/toybox/" identifier { type: "Git" value: "https://github.com/landley/toybox" - version: "b3691449460ff9ac6167e34fd56da95c4777ec82" + version: "eccdfdf8e7ef9239c03e90a5cf38e3a1b285bb76" } } diff --git a/tests/tar.test b/tests/tar.test index 29d007f1..772f2da6 100755 --- a/tests/tar.test +++ b/tests/tar.test @@ -48,10 +48,10 @@ testing "-T null" "$TAR --null -T input | LST" \ # inherited from Bell Labs Unix v7 # Note: testing both "tar c" and "tar -c" here. -testing "specify UID, fetch GID" "tar -c --owner nobody:65534 --group sys --mtime @0 file | LST" \ - "-rw-rw-r-- nobody/sys 0 1970-01-01 00:00 file\n" "" "" -testing "fetch UID, specify GID" "tar c --owner root --group nobody:65534 --mtime @0 file | LST" \ - "-rw-rw-r-- root/nobody 0 1970-01-01 00:00 file\n" "" "" +testing "specify UID, fetch GID" "tar -c --owner nobody:65534 --mtime @0 file | LST" \ + "-rw-rw-r-- nobody/$(stat -c %G file) 0 1970-01-01 00:00 file\n" "" "" +testing "fetch UID, specify GID" "tar c --group nobody:65534 --mtime @0 file | LST" \ + "-rw-rw-r-- $(stat -c %U file)/nobody 0 1970-01-01 00:00 file\n" "" "" # Large values switch from ascii numbers to a binary format. testing "huge values" "tar c --owner 9999999 --group 8888888 --mtime @0 file | SUM 3" \ @@ -154,11 +154,13 @@ nulldev=1,3 # devtmpfs values [ "$(uname)" == "Darwin" ] && nulldev=3,2 testing "pass /dev/null" \ - "tar c --mtime @0 --group sys /dev/null 2>/dev/null | LST" \ - "crw-rw-rw- root/sys $nulldev 1970-01-01 00:00 dev/null\n" "" "" + "tar c --mtime @0 /dev/null 2>/dev/null | LST" \ + "crw-rw-rw- $(stat -c %U/%G /dev/null) $nulldev 1970-01-01 00:00 dev/null\n" \ + "" "" testing "--absolute-names" \ - "tar c --mtime @0 --group sys --absolute-names /dev/null 2>/dev/null | LST" \ - "crw-rw-rw- root/sys $nulldev 1970-01-01 00:00 /dev/null\n" "" "" + "tar c --mtime @0 --absolute-names /dev/null 2>/dev/null | LST" \ + "crw-rw-rw- $(stat -c %U/%G /dev/null) $nulldev 1970-01-01 00:00 /dev/null\n"\ + "" "" # compression types testing "autodetect gzip" 'LST -f "$FILES"/tar/tar.tgz' \ @@ -231,6 +233,7 @@ toyonly testing "autodetect falls back to gzip -d when no zcat" \ "PATH=path; tar tf $FILES/tar/tar.tgz" "dir/\ndir/file\n" "" "" rm -rf path +# TODO: run sparse tests on tmpfs mount? (Request filesystem type?) # Only run sparse tests if filesystem can handle sparse files @4k granularity dd if=/dev/zero bs=4k count=1 seek=1 of=blah.img 2>/dev/null [ $(du blah.img | sed 's/[ \t].*//') -ne 4 ] && SKIP=999 |