From b85bb7827f9755caea4da995b91b1b4e18ded8ab Mon Sep 17 00:00:00 2001 From: Wei Jiangang Date: Wed, 7 Oct 2015 09:45:35 +0800 Subject: [PATCH] testscripts: make redirects happen in correct order It should redirect stdout to /dev/null firstly, then redirect stderr to whatever stdout currently points at. Signed-off-by: Wei Jiangang --- testscripts/ltpstress.sh | 4 ++-- testscripts/runEALtests.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testscripts/ltpstress.sh b/testscripts/ltpstress.sh index 39a5caf5bb1..651d3da7a5d 100755 --- a/testscripts/ltpstress.sh +++ b/testscripts/ltpstress.sh @@ -265,10 +265,10 @@ fi ulimit -u unlimited if [ $PROC_NUM -gt 0 ];then - genload --vm $PROC_NUM --vm-bytes 1073741824 2>&1 1>/dev/null & + genload --vm $PROC_NUM --vm-bytes 1073741824 >/dev/null 2>&1 & fi if [ $leftover_memsize -gt 0 ];then - genload --vm 1 --vm-bytes $(($leftover_memsize * 1024)) 2>&1 1>/dev/null & + genload --vm 1 --vm-bytes $(($leftover_memsize * 1024)) >/dev/null 2>&1 & fi if [ $NO_NETWORK -eq 0 ];then diff --git a/testscripts/runEALtests.sh b/testscripts/runEALtests.sh index bcd3f296f41..a70bfada744 100755 --- a/testscripts/runEALtests.sh +++ b/testscripts/runEALtests.sh @@ -84,7 +84,7 @@ fi while getopts cd:f:hi:l:m:Nnpqr:t:x arg do case $arg in c) - $LTPROOT/../testcases/bin/genload --cpu 1 2>&1 1>/dev/null & + $LTPROOT/../testcases/bin/genload --cpu 1 >/dev/null 2>&1 & GenLoad=1 ;; d) # append $$ to TMP, as it is recursively @@ -97,9 +97,9 @@ do case $arg in i) bytesize=$(($OPTARG * 1024 * 1024)) - $LTPROOT/../testcases/bin/genload --io 1 2>&1 1>/dev/null & + $LTPROOT/../testcases/bin/genload --io 1 >/dev/null 2>&1 & $LTPROOT/../testcases/bin/genload --hdd 0 --hdd-bytes $bytesize \ - 2>&1 1>/dev/null & + >/dev/null 2>&1 & GenLoad=1 ;; l) @@ -125,7 +125,7 @@ do case $arg in m) memsize=$(($OPTARG * 1024 * 1024)) $LTPROOT/../testcases/bin/genload --vm 0 --vm-bytes $memsize\ - 2>&1 1>/dev/null & + >/dev/null 2>&1 & GenLoad=1;; N) run_netest=1;; @@ -217,7 +217,7 @@ fi if [ $GenLoad -eq 1 ] then - killall -9 genload + killall -9 genload >/dev/null 2>&1 fi if [ $NetPipe -eq 1 ]