diff options
| author | Elliott Hughes <enh@google.com> | 2019-07-24 14:52:28 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-07-24 21:33:12 -0500 |
| commit | b891b49e08082f1385ae7150063841c0766f53c8 (patch) | |
| tree | bcc018e0cbf566c02e50e5e9b894d532ab5e029b /tests/chgrp.test | |
| parent | 6bf1360b72816b3ddc95b33de1bb111d718399b1 (diff) | |
| download | toybox-b891b49e08082f1385ae7150063841c0766f53c8.tar.gz | |
tests: fix for empty /etc/passwd or /etc/group.
It turns out some Android devices have an empty /etc/passwd and/or
/etc/group, which was defeating the previous workaround. Switch to
testing the intention more directly: we'll try the file in /etc, and if
that didn't work, we'll assume we need a workaround.
Diffstat (limited to 'tests/chgrp.test')
| -rwxr-xr-x | tests/chgrp.test | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/chgrp.test b/tests/chgrp.test index 5c7e4258..a137baed 100755 --- a/tests/chgrp.test +++ b/tests/chgrp.test @@ -9,13 +9,10 @@ then exit fi -if [ -f /etc/group ]; then - # We chgrp between "root" and the last group in /etc/group. - GRP="$(sed -n '$s/:.*//p' /etc/group)" -else - # Or assume we're on Android and pick a well-known group. - GRP=shell -fi +# We chgrp between "root" and the last group in /etc/group. +GRP="$(sed -n '$s/:.*//p' /etc/group)" +# Or if that fails, assume we're on Android and pick a well-known group. +: "${GRP:=shell}" # Set up a little testing hierarchy |