[PATCH 0/1] bash: fix run-intl ptest failed

[PATCH 0/1] bash: fix run-intl ptest failed

[Dengke Du]

The following changes since commit 5b61fa04a335a4fdefd435dc25d4bac41ee21e39:

  bitbake: toaster-tests: fix URL given for Chromedriver download (2016-07-29 09:53:32 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib dengke/fix-bash-ptest-run-intl-failed
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dengke/fix-bash-ptest-run-intl-failed

Dengke Du (1):
  bash: fix run-intl ptest failed

 meta/recipes-extended/bash/bash/fix-run-intl.patch | 116 +++++++++++++++++++++
 meta/recipes-extended/bash/bash_4.3.30.bb          |   3 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch

-- 
2.8.1

[PATCH 1/1] bash: fix run-intl ptest failed

[Dengke Du]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 6328 bytes --]

1. Filter the extra white space in intl.right

   When the sub-test unicode2.sub of intl.tests executed, it produced
   compact results without extra white space, compared to intl.right,
   it failed.

   So we need to filter the extra white space in intl.right.

2. Delete the '%q' in unicode3.sub

   In sub-test unicode3.sub of intl.tests have this:

		printf %q "$payload"

   The payload variable was assigned by ASCII characters, when using
   '%q' format strings, it means print the associated argument shell-quoted.

   But when the strings contain the non-alpha && non-digit && non-punctuation &&
   non-ISO 646 character(7-bit), it would output like this: " $'...', ANSI-C
   style quoted string. We can check the bash source code at:

	http://git.savannah.gnu.org/cgit/bash.git/tree/builtins/printf.def#n557
	http://git.savannah.gnu.org/cgit/bash.git/tree/lib/sh/strtrans.c#n331

   So we need to delete the format strings '%q', in this way the comparing
   could pass.

NOTE:
   Ensure the system contain fr-fr & de-de locales

   Some tests of intl.tests need to change locales to accomplish. So you need add
   the following to a conf file:

		IMAGE_LINGUAS = "en-us fr-fr de-de"

Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
 meta/recipes-extended/bash/bash/fix-run-intl.patch | 116 +++++++++++++++++++++
 meta/recipes-extended/bash/bash_4.3.30.bb          |   3 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch

diff --git a/meta/recipes-extended/bash/bash/fix-run-intl.patch b/meta/recipes-extended/bash/bash/fix-run-intl.patch
new file mode 100644
index 0000000..5f59066
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/fix-run-intl.patch
@@ -0,0 +1,116 @@
+From 56b869258922da108d35524dc124a1a64daa981a Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke.du@windriver.com>
+Date: Wed, 3 Aug 2016 23:13:00 -0400
+Subject: [PATCH] fix run-intl failed
+
+1. Filter extra white space of intl.right
+
+   Due to the extra white space of intl.right, when the result of
+   sub-test unicode2.sub of intl.tests compared to it, the test
+   failed.
+
+   So we need to filter the extra white space of intl.right.
+
+2. Delete the '%q' in unicode3.sub
+
+   In sub-test unicode3.sub of intl.tests, the payload value is:
+
+	payload=$'\065\247\100\063\231\053\306\123\070\237\242\352\263'
+
+   It used quoted string expansion(escaped octal) to assign ASCII
+   characters to variables. So when the test run the following:
+
+	printf %q "$payload"
+
+   It produced:
+
+	$'5\247@3\231+\306S8\237\242\352\263'
+
+   When compared to the intl.right(contain the converted character), it failed.
+
+   The format strings '%q' means print the associated argument shell-quoted.
+   Soucre code is here:
+
+	http://git.savannah.gnu.org/cgit/bash.git/tree/builtins/printf.def#n557
+	http://git.savannah.gnu.org/cgit/bash.git/tree/lib/sh/strtrans.c#n331
+
+   If the strings contain the non-alpha && non-digit && non-punctuation &&
+   non-ISO 646 character(7-bit), it would output like this: " $'...' " ANSI-C
+   style quoted string, just like the above.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke.du@windriver.com>
+---
+ tests/intl.right   | 28 ++++++++++++++--------------
+ tests/unicode3.sub |  2 +-
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/tests/intl.right b/tests/intl.right
+index acf108a..0c0c571 100644
+--- a/tests/intl.right
++++ b/tests/intl.right
+@@ -18,33 +18,33 @@ aéb
+ 1.0000
+ 1,0000
+ Passed all 1378 Unicode tests
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   357 277 277 012                                                
++0000000 357 277 277 012
+ 0000004
+-0000000   357 277 277 012                                                
++0000000 357 277 277 012
+ 0000004
+-0000000   012                                                            
++0000000 012
+ 0000001
+-0000000   012                                                            
++0000000 012
+ 0000001
+-0000000   012                                                            
++0000000 012
+ 0000001
+-0000000   012                                                            
++0000000 012
+ 0000001
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   303 277 012                                                    
++0000000 303 277 012
+ 0000003
+-0000000   101 040 302 243 040 305 222 012                                
++0000000 101 040 302 243 040 305 222 012
+ 0000010
+ ./unicode3.sub: line 2: 5§@3™+ÆS8Ÿ¢ê³: command not found
+ 5§@3™+ÆS8Ÿ¢ê³
+diff --git a/tests/unicode3.sub b/tests/unicode3.sub
+index f79871f..a4b97b2 100644
+--- a/tests/unicode3.sub
++++ b/tests/unicode3.sub
+@@ -1,7 +1,7 @@
+ payload=$'\065\247\100\063\231\053\306\123\070\237\242\352\263'
+ "$payload"
+ 
+-printf %q "$payload"
++printf "$payload"
+ echo
+ 
+ set -x ; : "$payload"
+-- 
+2.8.1
+
diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/meta/recipes-extended/bash/bash_4.3.30.bb
index 95ed392..3f0dd8b 100644
--- a/meta/recipes-extended/bash/bash_4.3.30.bb
+++ b/meta/recipes-extended/bash/bash_4.3.30.bb
@@ -20,7 +20,8 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            file://test-output.patch \
            file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \
            file://run-ptest \
-	   file://fix-run-builtins.patch \
+           file://fix-run-builtins.patch \
+           file://fix-run-intl.patch \
            "
 
 SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447"
-- 
2.8.1

Re: [PATCH 1/1] bash: fix run-intl ptest failed

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

On 8 August 2016 at 07:43, Dengke Du <dengke.du@windriver.com> wrote:

> +Upstream-Status: Pending
>

I've a fear of modifying upstream test suites to 'fix" them so that they
pass for us, and think that we should be talking with upstream to verify
that these are in fact broken test suites and not something else (such as
the test using busybox printf instead of bash or something like that).

Ross

[-- Attachment #2: Type: text/html, Size: 830 bytes --]

Re: [PATCH 1/1] bash: fix run-intl ptest failed

[dengke.du]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

Hi Ross

OK, thanks, I will send it to the upstream later.

//dengke

On 2016年08月08日 19:56, Burton, Ross wrote:
>
> On 8 August 2016 at 07:43, Dengke Du <dengke.du@windriver.com 
> <mailto:dengke.du@windriver.com>> wrote:
>
>     +Upstream-Status: Pending
>
>
> I've a fear of modifying upstream test suites to 'fix" them so that 
> they pass for us, and think that we should be talking with upstream to 
> verify that these are in fact broken test suites and not something 
> else (such as the test using busybox printf instead of bash or 
> something like that).
>
> Ross


[-- Attachment #2: Type: text/html, Size: 1735 bytes --]