diff options
author | Stephen Warren <swarren@wwwdotorg.org> | 2015-08-10 22:45:14 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-18 13:45:59 -0400 |
commit | 04812605f37cbb9ee02317e5f2d845dcd4898550 (patch) | |
tree | d26c067efe1d8ba094c7899c9770c65bbe6cde2c /test | |
parent | ea16c6a13bb3c3ee677b28253f2b7f3ec2bca700 (diff) |
fs-test.sh: minor fixes
- Re-direct stderr into the log files, so any errors U-Boot emits are
visible in the logs. This is relevant if the "reset" shell command
attempts to report that it's not supported on the sandbox board.
- Fix test_fs_nonfs() to name the files it created differently for each
invocation. Otherwise, the logs from different tests overwrite
each-other.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Suriyan Ramasami <suriyan.r@gmail.com>
Diffstat (limited to 'test')
-rwxr-xr-x | test/fs/fs-test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index a4fb0559625..b88a67ca066 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -485,9 +485,9 @@ function test_fs_nonfs() { echo "Creating files in $fs image if not already present." create_files $IMAGE $MD5_FILE_FS - OUT_FILE="${OUT}.fs.${fs}.out" + OUT_FILE="${OUT}.$1.${fs}.out" test_image $IMAGE $fs $SMALL_FILE $BIG_FILE $1 "" \ - > ${OUT_FILE} + > ${OUT_FILE} 2>&1 check_results $OUT_FILE $MD5_FILE_FS $SMALL_FILE $BIG_FILE \ $WRITE_FILE TOTAL_FAIL=$((TOTAL_FAIL + FAIL)) @@ -535,7 +535,7 @@ for fs in ext4 fat; do OUT_FILE="${OUT}.sb.${fs}.out" test_image $IMAGE $fs $SMALL_FILE $BIG_FILE sb `pwd`/$MOUNT_DIR \ - > ${OUT_FILE} + > ${OUT_FILE} 2>&1 sudo umount "$MOUNT_DIR" rmdir "$MOUNT_DIR" |