diff options
author | Stephen Warren <swarren@nvidia.com> | 2015-12-14 15:01:15 -0700 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-13 21:05:21 -0500 |
commit | 08eee2718aefea16d7a7e32e318ff03a1539e5c2 (patch) | |
tree | e16c07e46eecea64b148d4c624d5d414b39a9ec7 /test/fs | |
parent | 2a1a29c5e7a785d3efce2c74f0b27aca274ef482 (diff) |
test/fs: error case fixes/enhancements
- Use "mkdir -p" to avoid errors when intermediate directories are
missing.
- Fall back to "dd" when "fallocate" fails. For example, fallocate isn't
supported on ext4.
- Add error checking for test image generation. Without this, the test
simply plows on spewing all kinds of errors which are hard to
immediately root-cause.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'test/fs')
-rwxr-xr-x | test/fs/fs-test.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index fc41c04c15e..043e5d0c0e4 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -100,7 +100,7 @@ function compile_sandbox() { # We save time by not deleting and recreating the file system images function prepare_env() { rm -f ${MD5_FILE}.* ${OUT}.* - mkdir ${OUT_DIR} + mkdir -p ${OUT_DIR} } # 1st parameter is the name of the image file to be created @@ -115,11 +115,23 @@ function create_image() { fi if [ ! -f "$1" ]; then fallocate -l 3G "$1" &> /dev/null + if [ $? -ne 0 ]; then + echo fallocate failed - using dd instead + dd if=/dev/zero of=$1 bs=1024 count=$((3 * 1024 * 1024)) + if [ $? -ne 0 ]; then + echo Could not create empty disk image + exit $? + fi + fi mkfs -t "$2" $MKFS_OPTION "$1" &> /dev/null if [ $? -ne 0 -a "$2" = "fat" ]; then # If we fail and we did fat, try vfat. mkfs -t vfat $MKFS_OPTION "$1" &> /dev/null fi + if [ $? -ne 0 ]; then + echo Could not create filesystem + exit $? + fi fi } |