summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2016-04-19 04:55:53 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:43 +0100
commit95638699957ba974ba6ce0554c857ad81b73e65e (patch)
tree67a6987956e2a410d310bffca4c9fb6bbd25de14
parent9c812e7d3c612c505fd4e624056e11765e5a3506 (diff)
downloadpoky-95638699957ba974ba6ce0554c857ad81b73e65e.tar.gz
bash: fixed ptest run-builtins failed
1. redirect the stderr output of the command exec with -l option to /dev/null. Because when we run command exec with -l option in builtins.tests, it is a login shell, so it would read the file /etc/profile, that file executes the /usr/bin/resize which added by commit: cc6360f4c4d97e0000f9d3545f381224ee99ce7d The /usr/bin/resize is produced by busybox that source code resize.c contains: fprintf(stderr, ESC"7" ESC"[r" ESC"[999;999H" ESC"[6n"); In the end, it outputs an escape sequence to the stderr, so when we compare the test output file /tmp/xx with builtins.right, it failed. we need to redirect the stderr output to the /dev/null to solve the problem. 2. ensure the target system contains the locales "en_US.UTF-8". Because when run the run-builtins, it executes the source5.sub file that contain: LC_ALL=en_US.UTF-8 such as add the following to the local.conf: IMAGE_LINGUAS_append = " en-us" (From OE-Core rev: 5f82f3df7d4a7d6ae9a1ea3b6bc1d620a3d6c329) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash/fix-run-builtins.patch33
-rw-r--r--meta/recipes-extended/bash/bash_4.3.30.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash/fix-run-builtins.patch b/meta/recipes-extended/bash/bash/fix-run-builtins.patch
new file mode 100644
index 0000000000..2fa388302e
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/fix-run-builtins.patch
@@ -0,0 +1,33 @@
1From 0c4cab9594c96c2dc435a8d9724605824bcbf917 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 19 Apr 2016 02:57:45 -0400
4Subject: [PATCH] fix run-builtins failed
5
6FAIL: run-builtins
71. redirect the stderr output of command exec with -l option in
8 builtins.tests to /dev/null
92. ensure the system contain the locales "en_US.UTF-8"
10
11Upstream-Status: Pending
12
13Signed-off-by: Dengke Du <dengke.du@windriver.com>
14---
15 tests/builtins.tests | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/tests/builtins.tests b/tests/builtins.tests
19index 9d77520..63f3af8 100644
20--- a/tests/builtins.tests
21+++ b/tests/builtins.tests
22@@ -109,7 +109,7 @@ esac
23
24 # test options to exec
25 (exec -a specialname ${THIS_SH} -c 'echo $0' )
26-(exec -l -a specialname ${THIS_SH} -c 'echo $0' )
27+(exec -l -a specialname ${THIS_SH} -c 'echo $0' ) 2> /dev/null
28 # test `clean' environment. if /bin/sh is bash, and the script version of
29 # printenv is run, there will be variables in the environment that bash
30 # sets on startup. Also test code that prefixes argv[0] with a dash.
31--
322.8.1
33
diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/meta/recipes-extended/bash/bash_4.3.30.bb
index 4426cf00a0..95ed3925c7 100644
--- a/meta/recipes-extended/bash/bash_4.3.30.bb
+++ b/meta/recipes-extended/bash/bash_4.3.30.bb
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
20 file://test-output.patch \ 20 file://test-output.patch \
21 file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ 21 file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \
22 file://run-ptest \ 22 file://run-ptest \
23 file://fix-run-builtins.patch \
23 " 24 "
24 25
25SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447" 26SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447"