aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-01-22 22:04:24 (GMT)
committerRob Landley <rob@landley.net>2018-01-23 07:20:23 (GMT)
commit1fec45a2a57f431bef990b7a17449f7ff96cac30 (patch)
tree41f1b886232f70f2a4a55d0aa2dded135167d1c0
parentc26d631f7b385859ba4e76f6b1e6789e105f42b3 (diff)
downloadandroid_external_toybox-1fec45a2a57f431bef990b7a17449f7ff96cac30.zip
android_external_toybox-1fec45a2a57f431bef990b7a17449f7ff96cac30.tar.gz
android_external_toybox-1fec45a2a57f431bef990b7a17449f7ff96cac30.tar.bz2
Fix hang in losetup test.
Switch the printf over to %s because the input is actually hex (so %d is wrong), but without the leading "0x" that %x would require. For some reason the NODE assignment wasn't providing any input to awk (hence the hang), and awk wasn't looking for the correct field anyway. The tests still fail for me: losetup: /dev/block/loop0: No such device or address losetup: /dev/block/loop0: No such device or address losetup: file: No such file or directory losetup: needs 1 arg (see "losetup --help") But at least now they allow the other tests to continue!
-rwxr-xr-xtests/losetup.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/losetup.test b/tests/losetup.test
index 651c693..c929250 100755
--- a/tests/losetup.test
+++ b/tests/losetup.test
@@ -13,8 +13,8 @@ fi
truncate -s 1M blah.img &&
FILE="$(readlink -f blah.img)"
-DEV="$(printf '%04d' $(stat -t blah.img | awk '{print $7}'))"
-NODE="$(awk '{print $7}')"
+DEV="$(printf '%04s' $(stat -t blah.img | awk '{print $7}'))"
+NODE="$(stat -t blah.img | awk '{print $8}')"
losetup -f
losetup -f -s