[PATCH 0/2] flex: upgrade to 2.5.38 and enable ptest support

[PATCH 0/2] flex: upgrade to 2.5.38 and enable ptest support

[Chong Lu]

The following changes since commit b60ed2d0fd86a3ae5ce7facbb044677aa7ec2889:

  bitbake: runqueue: Ensure we do run 'masked' setscene tasks if specified as targets (2014-02-13 17:57:20 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib chonglu/flex
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/flex

Chong Lu (2):
  flex: upgrade to 2.5.38
  flex: enable ptest support

 meta/recipes-devtools/flex/files/run-ptest         | 29 ++++++++++++++++++++++
 meta/recipes-devtools/flex/flex.inc                | 21 ++++++++++++++--
 .../flex/{flex_2.5.37.bb => flex_2.5.38.bb}        |  4 +--
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100755 meta/recipes-devtools/flex/files/run-ptest
 rename meta/recipes-devtools/flex/{flex_2.5.37.bb => flex_2.5.38.bb} (57%)

-- 
1.8.1.2

[PATCH 1/2] flex: upgrade to 2.5.38

[Chong Lu]

Upgrade flex to 2.5.38.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-devtools/flex/{flex_2.5.37.bb => flex_2.5.38.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/flex/{flex_2.5.37.bb => flex_2.5.38.bb} (57%)

diff --git a/meta/recipes-devtools/flex/flex_2.5.37.bb b/meta/recipes-devtools/flex/flex_2.5.38.bb
similarity index 57%
rename from meta/recipes-devtools/flex/flex_2.5.37.bb
rename to meta/recipes-devtools/flex/flex_2.5.38.bb
index c57a948..226e469 100644
--- a/meta/recipes-devtools/flex/flex_2.5.37.bb
+++ b/meta/recipes-devtools/flex/flex_2.5.38.bb
@@ -5,5 +5,5 @@ BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI += "file://do_not_create_pdf_doc.patch"
 
-SRC_URI[md5sum] = "c75940e1fc25108f2a7b3ef42abdae06"
-SRC_URI[sha256sum] = "17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a"
+SRC_URI[md5sum] = "b230c88e65996ff74994d08a2a2e0f27"
+SRC_URI[sha256sum] = "d42a67ce11b649ce977c8e239d04b2ef1bdbffebb8a79f4f65211ad295f274ec"
-- 
1.8.1.2

[PATCH 2/2] flex: enable ptest support

[Chong Lu]

Install flex test suite and run it as ptest.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-devtools/flex/files/run-ptest | 29 +++++++++++++++++++++++++++++
 meta/recipes-devtools/flex/flex.inc        | 21 +++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100755 meta/recipes-devtools/flex/files/run-ptest

diff --git a/meta/recipes-devtools/flex/files/run-ptest b/meta/recipes-devtools/flex/files/run-ptest
new file mode 100755
index 0000000..bffba16
--- /dev/null
+++ b/meta/recipes-devtools/flex/files/run-ptest
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+test1="test-alloc-extra test-array-nr test-array-r test-basic-nr test-basic-r test-extended test-quotes \
+test-bison-nr test-bison-yylloc test-bison-yylval test-c++-basic test-c-cpp-nr test-prefix-nr test-ccl \
+test-c-cpp-r test-c++-multiple-scanners test-mem-r test-mem-nr test-debug-nr test-linedir-r test-noansi-r \
+test-yyextra test-header-r test-noansi-nr test-debug-r TEMPLATE test-top test-header-nr test-prefix-r"
+test2="test-multiple-scanners-nr test-posixly-correct test-posix test-string-r test-string-nr"
+test3="test-pthread test-include-by-push test-include-by-buffer test-include-by-reentrant"
+test4="test-lineno-nr test-lineno-r test-lineno-trailing"
+test5="test-c++-yywrap test-rescan-r test-rescan-nr"
+test6="test-reject-nr test-reject-r"
+test7="test-reject-ser test-reject-ver"
+test8="test-multiple-scanners-r"
+
+output() {
+  if [ $? -eq 0 ]; \
+    then echo "PASS: $i"; \
+    else echo "FAIL: $i"; \
+  fi;
+}
+
+for i in $test1; do $i/$i < $i/test.input >/dev/null; output; done
+for i in $test2; do $i/$i >/dev/null; output; done
+for i in $test3; do cd $i; ./$i test-1.input >/dev/null; output; cd ..; done
+for i in $test4; do test `$i/$i < $i/test.input` -eq `$i/$i 1 < $i/test.input` >/dev/null; output; done
+for i in $test5; do $i/$i $i/test.input >/dev/null; output; done
+for i in $test6; do test-reject/$i < test-reject/test.input >/dev/null; output; done
+for i in $test7; do test-reject/$i test-reject/$i.tables < test-reject/test.input >/dev/null; output; done
+cd $test8; ./$test8 >/dev/null; i=$test8 output
diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 96d5de5..75c10ef 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -6,9 +6,12 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/"
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
+SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
+           file://run-ptest \
+"
+
+inherit autotools gettext ptest
 
-inherit autotools gettext
 
 M4 = "${bindir}/m4"
 M4_class-native = "${STAGING_BINDIR_NATIVE}/m4"
@@ -25,3 +28,17 @@ do_install_append_class-nativesdk() {
 }
 
 RDEPENDS_${PN} += "m4"
+DEPENDS_${PN}-ptest += "bison-native flex-native"
+
+do_compile_ptest() {
+	for i in `find ${S}/tests/ -type d |grep -Ev "concatenated-options|reject|table-opts" | awk -F/ '{print $NF}'`; \
+	  do oe_runmake -C ${S}/tests/$i -f ${B}/tests/$i/Makefile top_builddir=${B} FLEX=flex $i; \
+	done
+	oe_runmake -C ${S}/tests/test-reject -f ${B}/tests/test-reject/Makefile top_builddir=${B} FLEX=flex test-reject-nr test-reject-r test-reject-ser test-reject-ver
+}
+
+do_install_ptest() {
+	for i in `find ${S}/tests/ -type d | awk -F/ '{print $NF}'`; \
+	  do cp -r ${S}/tests/$i ${D}${PTEST_PATH}; \
+	done
+}
-- 
1.8.1.2