Skip to content

Commit

Permalink
testscripts: make redirects happen in correct order
Browse files Browse the repository at this point in the history
It should redirect stdout to /dev/null firstly,
then redirect stderr to whatever stdout currently points at.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
  • Loading branch information
PandaWei authored and metan-ucw committed Oct 7, 2015
1 parent a34206b commit b85bb78
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions testscripts/ltpstress.sh
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions testscripts/runEALtests.sh
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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;;
Expand Down Expand Up @@ -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 ]
Expand Down

0 comments on commit b85bb78

Please sign in to comment.