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:12:44 +0100 |
commit | 36f6caae93670cc4086ada533e7c319d53433235 (patch) | |
tree | 7d3e28f25164021e66b066b046c211b861449569 /meta | |
parent | cdfc5150862dc3128bd85353f0263213e595778b (diff) | |
download | poky-36f6caae93670cc4086ada533e7c319d53433235.tar.gz |
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
(From OE-Core rev: 70c6e0b84d3e17807cbea0677df2f0772a284130)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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() { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | for i in test_simple_sequence test_undetected_loop; \ | 13 | for i in test_simple_sequence test_undetected_loop; \ |
14 | do $i &>/dev/null ; output; \ | 14 | do $i >/dev/null 2>&1; output; \ |
15 | done | 15 | done |
16 | 16 | ||
17 | rm -rf ${tmpdir} | 17 | 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() { | |||
55 | RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ | 55 | RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ |
56 | perl-module-filehandle perl-module-getopt-std \ | 56 | perl-module-filehandle perl-module-getopt-std \ |
57 | perl-module-posix perl-module-file-temp \ | 57 | perl-module-posix perl-module-file-temp \ |
58 | perl-module-text-parsewords \ | 58 | perl-module-text-parsewords bash \ |
59 | " | 59 | " |
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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | ln -sf /bin/ed /usr/bin/ed | 3 | ln -sf /bin/ed /usr/bin/ed |
4 | 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 | 4 | 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 |
5 | rm -f /usr/bin/ed | 5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | for i in `ls tests/*.test |awk -F/ '{print $2}'`; \ | 3 | for i in `ls tests/*.test |awk -F/ '{print $2}'`; \ |
4 | do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i &>$i.tmp; \ | 4 | do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.tmp 2>&1; \ |
5 | grep -q "^Files with failing tests:" $i.tmp; \ | 5 | grep -q "^Files with failing tests:" $i.tmp; \ |
6 | if [ $? == 0 ]; then echo "FAIL: $i"; \ | 6 | if [ $? -eq 0 ]; then echo "FAIL: $i"; \ |
7 | else echo "PASS: $i"; rm -f $i.tmp; fi; \ | 7 | else echo "PASS: $i"; rm -f $i.tmp; fi; \ |
8 | done | 8 | 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 @@ | |||
3 | cd test | 3 | cd test |
4 | for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \ | 4 | for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \ |
5 | do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \ | 5 | do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \ |
6 | make -f Maketests $i &>$i.tmp; \ | 6 | make -f Maketests $i >$i.tmp 2>&1; \ |
7 | grep -q "Error" $i.tmp; \ | 7 | grep -q "Error" $i.tmp; \ |
8 | if [ $? == 0 ]; then echo "FAIL: $i"; \ | 8 | if [ $? -eq 0 ]; then echo "FAIL: $i"; \ |
9 | else echo "PASS: $i"; rm -f $i.tmp; fi; \ | 9 | else echo "PASS: $i"; rm -f $i.tmp; fi; \ |
10 | done | 10 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | cd tests | 3 | cd tests |
4 | for i in `ls`; do ./$i; if [ $? == 0 ]; then echo "PASS: $i"; \ | 4 | for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \ |
5 | else echo "FAIL: $i"; fi; done | 5 | else echo "FAIL: $i"; fi; done |