diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-27 08:57:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 15:11:11 +0100 |
commit | 70c6e0b84d3e17807cbea0677df2f0772a284130 (patch) | |
tree | 88abe5404443f41e318aac6812cef4e659cb7bd4 | |
parent | 62d455f89fb1d2c22cf987bdbb56a55e6d031ce0 (diff) | |
download | openembedded-core-70c6e0b84d3e17807cbea0677df2f0772a284130.tar.gz openembedded-core-70c6e0b84d3e17807cbea0677df2f0772a284130.tar.bz2 openembedded-core-70c6e0b84d3e17807cbea0677df2f0772a284130.zip |
run-ptest: fix bashism
These script use /bin/sh as the interpreter, but contains bashism:
recipes-devtools/insserv/files/run-ptest
recipes-devtools/quilt/quilt/run-ptest
recipes-devtools/tcltk/tcl/run-ptest
recipes-extended/gawk/gawk-4.1.1/run-ptest
recipes-support/beecrypt/beecrypt/run-ptest
Fixed:
"==" -> "=" (should be -eq when integer)
"&>log" -> ">log 2>&1"
And quilt's test scripts requires bash, add bash to RDEPENDS_quilt-ptest
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/insserv/files/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt-0.63.inc | 2 | ||||
-rwxr-xr-x | meta/recipes-devtools/quilt/quilt/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/run-ptest | 4 | ||||
-rw-r--r-- | meta/recipes-extended/gawk/gawk-4.1.1/run-ptest | 4 | ||||
-rw-r--r-- | meta/recipes-support/beecrypt/beecrypt/run-ptest | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/insserv/files/run-ptest b/meta/recipes-devtools/insserv/files/run-ptest index 495d1551c2..4a6da3030a 100644 --- a/meta/recipes-devtools/insserv/files/run-ptest +++ b/meta/recipes-devtools/insserv/files/run-ptest @@ -11,7 +11,7 @@ output() { } for i in test_simple_sequence test_undetected_loop; \ - do $i &>/dev/null ; output; \ + do $i >/dev/null 2>&1; output; \ done rm -rf ${tmpdir} diff --git a/meta/recipes-devtools/quilt/quilt-0.63.inc b/meta/recipes-devtools/quilt/quilt-0.63.inc index f3757859ff..433d6b4089 100644 --- a/meta/recipes-devtools/quilt/quilt-0.63.inc +++ b/meta/recipes-devtools/quilt/quilt-0.63.inc @@ -55,5 +55,5 @@ do_install_ptest() { RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ - perl-module-text-parsewords \ + perl-module-text-parsewords bash \ " diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest index 1ea0dae128..958a9df5b6 100755 --- a/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/meta/recipes-devtools/quilt/quilt/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh ln -sf /bin/ed /usr/bin/ed -for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? == 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done +for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done rm -f /usr/bin/ed diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index a5d6548d2a..dadba655f2 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -1,8 +1,8 @@ #!/bin/sh for i in `ls tests/*.test |awk -F/ '{print $2}'`; \ - do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i &>$i.tmp; \ + do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.tmp 2>&1; \ grep -q "^Files with failing tests:" $i.tmp; \ - if [ $? == 0 ]; then echo "FAIL: $i"; \ + if [ $? -eq 0 ]; then echo "FAIL: $i"; \ else echo "PASS: $i"; rm -f $i.tmp; fi; \ done diff --git a/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest index 7d214eafbe..d23f0bf6d7 100644 --- a/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest +++ b/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest @@ -3,8 +3,8 @@ cd test for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \ do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \ - make -f Maketests $i &>$i.tmp; \ + make -f Maketests $i >$i.tmp 2>&1; \ grep -q "Error" $i.tmp; \ - if [ $? == 0 ]; then echo "FAIL: $i"; \ + if [ $? -eq 0 ]; then echo "FAIL: $i"; \ else echo "PASS: $i"; rm -f $i.tmp; fi; \ done diff --git a/meta/recipes-support/beecrypt/beecrypt/run-ptest b/meta/recipes-support/beecrypt/beecrypt/run-ptest index 5bc7460be9..2ee294d991 100644 --- a/meta/recipes-support/beecrypt/beecrypt/run-ptest +++ b/meta/recipes-support/beecrypt/beecrypt/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh cd tests -for i in `ls`; do ./$i; if [ $? == 0 ]; then echo "PASS: $i"; \ +for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \ else echo "FAIL: $i"; fi; done |