From 73cd6887d3bb479b24b0baa7828ea25062819fd2 Mon Sep 17 00:00:00 2001 From: Gregoire Pichon Date: Wed, 31 May 2017 16:50:50 +0200 Subject: [PATCH] LU-8941 tests: remove wrong redirection syntaxes The "2&>" redirection syntax is wrong. Replace it with what was probably intended by the test writer. Test-Parameters: trivial testlist=replay-single,sanityn Signed-off-by: Gregoire Pichon Change-Id: I8322bc853316a2580572c415fc1af4b73377fbc2 Reviewed-on: https://review.whamcloud.com/27351 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: John L. Hammond --- lustre/tests/replay-single.sh | 16 ++++++++-------- lustre/tests/sanityn.sh | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 60b3ef1..2c85dae 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -2821,7 +2821,7 @@ test_81a() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -2851,7 +2851,7 @@ test_81b() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -2884,7 +2884,7 @@ test_81c() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -2911,7 +2911,7 @@ test_81d() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -2943,7 +2943,7 @@ test_81e() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -2974,7 +2974,7 @@ test_81f() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -3007,7 +3007,7 @@ test_81g() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" @@ -3034,7 +3034,7 @@ test_81h() { wait $CLIENT_PID || error "rm remote dir failed" - stat $remote_dir 2&>/dev/null && error "$remote_dir still exist!" + stat $remote_dir &>/dev/null && error "$remote_dir still exist!" rm -rf $DIR/$tdir || error "rmdir failed" diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 74ae81e..f5c7fe5 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -3680,7 +3680,7 @@ test_80b() { ( while true; do mdt_idx=$((RANDOM % MDSCOUNT)) - $LFS migrate -m $mdt_idx $migrate_dir1 2&>/dev/null || + $LFS migrate -m $mdt_idx $migrate_dir1 &>/dev/null || rc=$? [ $rc -ne 0 -o $rc -ne 16 ] || break done @@ -3724,23 +3724,23 @@ test_80b() { if [ -e $migrate_dir2/source_file ]; then ln $migrate_dir2/source_file $migrate_dir2/link_file \ - 2&>/dev/null || rc1=$? + &>/dev/null || rc1=$? if [ -e $migrate_dir2/link_file ]; then rm -rf $migrate_dir2/link_file fi mrename $migrate_dir2/source_file \ - $migrate_dir2/target_file 2&>/dev/null || rc1=$? + $migrate_dir2/target_file &>/dev/null || rc1=$? [ $rc1 -ne 0 -o $rc1 -ne 1 ] || { echo "rename failed with $rc1" break } if [ -e $migrate_dir2/target_file ]; then - rm -rf $migrate_dir2/target_file 2&>/dev/null || + rm -rf $migrate_dir2/target_file &>/dev/null || rc1=$? else - rm -rf $migrate_dir2/source_file 2&>/dev/null || + rm -rf $migrate_dir2/source_file &>/dev/null || rc1=$? fi [ $rc1 -ne 0 -o $rc1 -ne 1 ] || { -- 1.8.3.1