Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/1] piglit: enable ptest support
  2014-08-18  3:11 [PATCH 0/1] " Chong Lu
@ 2014-08-18  3:11 ` Chong Lu
  2014-08-18  5:39   ` Chong Lu
  0 siblings, 1 reply; 8+ messages in thread
From: Chong Lu @ 2014-08-18  3:11 UTC (permalink / raw)
  To: openembedded-core

Install libpcre test suite and run it as ptest.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-graphics/piglit/piglit/run-ptest |  5 +++++
 meta/recipes-graphics/piglit/piglit_git.bb    | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/piglit/piglit/run-ptest

diff --git a/meta/recipes-graphics/piglit/piglit/run-ptest b/meta/recipes-graphics/piglit/piglit/run-ptest
new file mode 100644
index 0000000..fba2e8d
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests `pwd`/results/sanity.results 2>&1 | \
+    grep -E "pass ::|fail ::|skip ::|warn ::" | cut -d' ' -f11- | \
+    sed -e 's|pass ::|PASS:|' -e 's|warn ::|PASS:|' -e 's|fail ::|FAIL:|' -e 's|skip ::|SKIP:|'
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 5c013ef..de4a839 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -2,7 +2,8 @@ SUMMARY = "OpenGL driver testing framework"
 LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
-SRC_URI = "git://anongit.freedesktop.org/piglit"
+SRC_URI = "git://anongit.freedesktop.org/piglit \
+           file://run-ptest"
 
 # From 2012/12/30.
 SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
@@ -13,7 +14,7 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
 
-inherit cmake pythonnative
+inherit cmake pythonnative ptest
 
 # As piglit doesn't install, enforce in-tree builds so that we can easily copy
 # contents out of $S and $B.
@@ -36,7 +37,6 @@ do_install() {
 	cp -Pr lib/ ${D}${libdir}/piglit/
 	cp -Pr framework/ ${D}${libdir}/piglit/
 	cp -Pr generated_tests/ ${D}${libdir}/piglit/
-	cp -Pr tests/ ${D}${libdir}/piglit/
 	cp -Pr templates/ ${D}${libdir}/piglit/
 
 	sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
@@ -46,3 +46,7 @@ do_install() {
 FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
 
 RDEPENDS_${PN} = "python waffle python-json python-subprocess python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
+
+do_install_ptest() {
+	cp -Pr tests/ ${D}${PTEST_PATH}/
+}
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/1] piglit: enable ptest support
  2014-08-18  3:11 ` [PATCH 1/1] " Chong Lu
@ 2014-08-18  5:39   ` Chong Lu
  0 siblings, 0 replies; 8+ messages in thread
From: Chong Lu @ 2014-08-18  5:39 UTC (permalink / raw)
  To: openembedded-core


On 08/18/2014 11:11 AM, Chong Lu wrote:
> Install libpcre test suite and run it as ptest.
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>   meta/recipes-graphics/piglit/piglit/run-ptest |  5 +++++
>   meta/recipes-graphics/piglit/piglit_git.bb    | 10 +++++++---
>   2 files changed, 12 insertions(+), 3 deletions(-)
>   create mode 100644 meta/recipes-graphics/piglit/piglit/run-ptest
>
> diff --git a/meta/recipes-graphics/piglit/piglit/run-ptest b/meta/recipes-graphics/piglit/piglit/run-ptest
> new file mode 100644
> index 0000000..fba2e8d
> --- /dev/null
> +++ b/meta/recipes-graphics/piglit/piglit/run-ptest
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +
> +env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests `pwd`/results/sanity.results 2>&1 | \
> +    grep -E "pass ::|fail ::|skip ::|warn ::" | cut -d' ' -f11- | \
> +    sed -e 's|pass ::|PASS:|' -e 's|warn ::|PASS:|' -e 's|fail ::|FAIL:|' -e 's|skip ::|SKIP:|'
> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
> index 5c013ef..de4a839 100644
> --- a/meta/recipes-graphics/piglit/piglit_git.bb
> +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> @@ -2,7 +2,8 @@ SUMMARY = "OpenGL driver testing framework"
>   LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
>   
> -SRC_URI = "git://anongit.freedesktop.org/piglit"
> +SRC_URI = "git://anongit.freedesktop.org/piglit \
> +           file://run-ptest"
>   
>   # From 2012/12/30.
>   SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
> @@ -13,7 +14,7 @@ S = "${WORKDIR}/git"
>   
>   DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
>   
> -inherit cmake pythonnative
> +inherit cmake pythonnative ptest
>   
>   # As piglit doesn't install, enforce in-tree builds so that we can easily copy
>   # contents out of $S and $B.
> @@ -36,7 +37,6 @@ do_install() {
>   	cp -Pr lib/ ${D}${libdir}/piglit/
>   	cp -Pr framework/ ${D}${libdir}/piglit/
>   	cp -Pr generated_tests/ ${D}${libdir}/piglit/
> -	cp -Pr tests/ ${D}${libdir}/piglit/
>   	cp -Pr templates/ ${D}${libdir}/piglit/
>   
>   	sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
> @@ -46,3 +46,7 @@ do_install() {
>   FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
>   
>   RDEPENDS_${PN} = "python waffle python-json python-subprocess python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
> +
> +do_install_ptest() {
> +	cp -Pr tests/ ${D}${PTEST_PATH}/
> +}

Please ignore this one, I will resend.

Best Regards
Chong



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH V2 0/1] piglit: enable ptest support
@ 2014-08-18  5:39 Chong Lu
  2014-08-18  5:39 ` [PATCH 1/1] " Chong Lu
  0 siblings, 1 reply; 8+ messages in thread
From: Chong Lu @ 2014-08-18  5:39 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 59b0f7f01bbac6f1c10ee00382c5136d1f327960:

  chrpath: Drop warning from darwn builds (2014-08-17 10:01:36 +0100)

are available in the git repository at:

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

Chong Lu (1):
  piglit: enable ptest support

 meta/recipes-graphics/piglit/piglit/run-ptest |  5 +++++
 meta/recipes-graphics/piglit/piglit_git.bb    | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/piglit/piglit/run-ptest

-- 
1.9.1



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/1] piglit: enable ptest support
  2014-08-18  5:39 [PATCH V2 0/1] piglit: enable ptest support Chong Lu
@ 2014-08-18  5:39 ` Chong Lu
  2014-08-28 14:09   ` Burton, Ross
  0 siblings, 1 reply; 8+ messages in thread
From: Chong Lu @ 2014-08-18  5:39 UTC (permalink / raw)
  To: openembedded-core

Install piglit test suite and run it as ptest.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-graphics/piglit/piglit/run-ptest |  5 +++++
 meta/recipes-graphics/piglit/piglit_git.bb    | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/piglit/piglit/run-ptest

diff --git a/meta/recipes-graphics/piglit/piglit/run-ptest b/meta/recipes-graphics/piglit/piglit/run-ptest
new file mode 100644
index 0000000..fba2e8d
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests `pwd`/results/sanity.results 2>&1 | \
+    grep -E "pass ::|fail ::|skip ::|warn ::" | cut -d' ' -f11- | \
+    sed -e 's|pass ::|PASS:|' -e 's|warn ::|PASS:|' -e 's|fail ::|FAIL:|' -e 's|skip ::|SKIP:|'
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 5c013ef..de4a839 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -2,7 +2,8 @@ SUMMARY = "OpenGL driver testing framework"
 LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
-SRC_URI = "git://anongit.freedesktop.org/piglit"
+SRC_URI = "git://anongit.freedesktop.org/piglit \
+           file://run-ptest"
 
 # From 2012/12/30.
 SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
@@ -13,7 +14,7 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
 
-inherit cmake pythonnative
+inherit cmake pythonnative ptest
 
 # As piglit doesn't install, enforce in-tree builds so that we can easily copy
 # contents out of $S and $B.
@@ -36,7 +37,6 @@ do_install() {
 	cp -Pr lib/ ${D}${libdir}/piglit/
 	cp -Pr framework/ ${D}${libdir}/piglit/
 	cp -Pr generated_tests/ ${D}${libdir}/piglit/
-	cp -Pr tests/ ${D}${libdir}/piglit/
 	cp -Pr templates/ ${D}${libdir}/piglit/
 
 	sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
@@ -46,3 +46,7 @@ do_install() {
 FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
 
 RDEPENDS_${PN} = "python waffle python-json python-subprocess python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
+
+do_install_ptest() {
+	cp -Pr tests/ ${D}${PTEST_PATH}/
+}
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/1] piglit: enable ptest support
  2014-08-18  5:39 ` [PATCH 1/1] " Chong Lu
@ 2014-08-28 14:09   ` Burton, Ross
  2014-09-02  2:14     ` Robert Yang
  0 siblings, 1 reply; 8+ messages in thread
From: Burton, Ross @ 2014-08-28 14:09 UTC (permalink / raw)
  To: Chong Lu; +Cc: OE-core

On 18 August 2014 06:39, Chong Lu <Chong.Lu@windriver.com> wrote:
> +env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests `pwd`/results/sanity.results 2>&1

You shouldn't need to set PIGLIT_BUILD_DIR.

The sanity tests are very basic so this won't count as "running
piglit" in any meaningful QA sense.

> @@ -36,7 +37,6 @@ do_install() {
>         cp -Pr lib/ ${D}${libdir}/piglit/
>         cp -Pr framework/ ${D}${libdir}/piglit/
>         cp -Pr generated_tests/ ${D}${libdir}/piglit/
> -       cp -Pr tests/ ${D}${libdir}/piglit/
>         cp -Pr templates/ ${D}${libdir}/piglit/
>
>         sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
> @@ -46,3 +46,7 @@ do_install() {
>  FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
>
>  RDEPENDS_${PN} = "python waffle python-json python-subprocess python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
> +
> +do_install_ptest() {
> +       cp -Pr tests/ ${D}${PTEST_PATH}/
> +}

Why move the tests directory to the -ptests package?  That makes
piglit unusable without installing piglit-ptest.

I agree that piglit should be ptest-enabled, but the piglit-ptest
package should simply depend on piglit and contain the runner script.

Ross


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/1] piglit: enable ptest support
  2014-08-28 14:09   ` Burton, Ross
@ 2014-09-02  2:14     ` Robert Yang
  2014-09-02  7:33       ` Robert Yang
  0 siblings, 1 reply; 8+ messages in thread
From: Robert Yang @ 2014-09-02  2:14 UTC (permalink / raw)
  To: Burton, Ross, Chong Lu; +Cc: OE-core



On 08/28/2014 10:09 PM, Burton, Ross wrote:
> On 18 August 2014 06:39, Chong Lu <Chong.Lu@windriver.com> wrote:
>> +env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests `pwd`/results/sanity.results 2>&1
>
> You shouldn't need to set PIGLIT_BUILD_DIR.
>
> The sanity tests are very basic so this won't count as "running
> piglit" in any meaningful QA sense.
>
>> @@ -36,7 +37,6 @@ do_install() {
>>          cp -Pr lib/ ${D}${libdir}/piglit/
>>          cp -Pr framework/ ${D}${libdir}/piglit/
>>          cp -Pr generated_tests/ ${D}${libdir}/piglit/
>> -       cp -Pr tests/ ${D}${libdir}/piglit/
>>          cp -Pr templates/ ${D}${libdir}/piglit/
>>
>>          sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
>> @@ -46,3 +46,7 @@ do_install() {
>>   FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
>>
>>   RDEPENDS_${PN} = "python waffle python-json python-subprocess python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
>> +
>> +do_install_ptest() {
>> +       cp -Pr tests/ ${D}${PTEST_PATH}/
>> +}
>
> Why move the tests directory to the -ptests package?  That makes
> piglit unusable without installing piglit-ptest.

Hello, if we keep the tests dir in piglit, shall we add perl to
the RDEPENDS ? There are perl scripts in the tests dir.

// Robert

>
> I agree that piglit should be ptest-enabled, but the piglit-ptest
> package should simply depend on piglit and contain the runner script.
>
> Ross
>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/1] piglit: enable ptest support
  2014-09-02  2:14     ` Robert Yang
@ 2014-09-02  7:33       ` Robert Yang
  2014-09-02  7:35         ` Richard Purdie
  0 siblings, 1 reply; 8+ messages in thread
From: Robert Yang @ 2014-09-02  7:33 UTC (permalink / raw)
  To: openembedded-core



On 09/02/2014 10:14 AM, Robert Yang wrote:
>
>
> On 08/28/2014 10:09 PM, Burton, Ross wrote:
>> On 18 August 2014 06:39, Chong Lu <Chong.Lu@windriver.com> wrote:
>>> +env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests
>>> `pwd`/results/sanity.results 2>&1
>>
>> You shouldn't need to set PIGLIT_BUILD_DIR.
>>
>> The sanity tests are very basic so this won't count as "running
>> piglit" in any meaningful QA sense.
>>
>>> @@ -36,7 +37,6 @@ do_install() {
>>>          cp -Pr lib/ ${D}${libdir}/piglit/
>>>          cp -Pr framework/ ${D}${libdir}/piglit/
>>>          cp -Pr generated_tests/ ${D}${libdir}/piglit/
>>> -       cp -Pr tests/ ${D}${libdir}/piglit/
>>>          cp -Pr templates/ ${D}${libdir}/piglit/
>>>
>>>          sed -i -e
>>> 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|'
>>> ${D}${bindir}/piglit-*.py
>>> @@ -46,3 +46,7 @@ do_install() {
>>>   FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
>>>
>>>   RDEPENDS_${PN} = "python waffle python-json python-subprocess
>>> python-multiprocessing python-textutils python-netserver python-shell
>>> mesa-demos"
>>> +
>>> +do_install_ptest() {
>>> +       cp -Pr tests/ ${D}${PTEST_PATH}/
>>> +}
>>
>> Why move the tests directory to the -ptests package?  That makes
>> piglit unusable without installing piglit-ptest.
>
> Hello, if we keep the tests dir in piglit, shall we add perl to

Sorry, bash, in fact.

// Robert

> the RDEPENDS ? There are perl scripts in the tests dir.
>
> // Robert
>
>>
>> I agree that piglit should be ptest-enabled, but the piglit-ptest
>> package should simply depend on piglit and contain the runner script.
>>
>> Ross
>>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/1] piglit: enable ptest support
  2014-09-02  7:33       ` Robert Yang
@ 2014-09-02  7:35         ` Richard Purdie
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2014-09-02  7:35 UTC (permalink / raw)
  To: Robert Yang; +Cc: openembedded-core

On Tue, 2014-09-02 at 15:33 +0800, Robert Yang wrote:
> 
> On 09/02/2014 10:14 AM, Robert Yang wrote:
> >
> >
> > On 08/28/2014 10:09 PM, Burton, Ross wrote:
> >> On 18 August 2014 06:39, Chong Lu <Chong.Lu@windriver.com> wrote:
> >>> +env PIGLIT_BUILD_DIR=`pwd`/.. piglit-run.py `pwd`/tests/sanity.tests
> >>> `pwd`/results/sanity.results 2>&1
> >>
> >> You shouldn't need to set PIGLIT_BUILD_DIR.
> >>
> >> The sanity tests are very basic so this won't count as "running
> >> piglit" in any meaningful QA sense.
> >>
> >>> @@ -36,7 +37,6 @@ do_install() {
> >>>          cp -Pr lib/ ${D}${libdir}/piglit/
> >>>          cp -Pr framework/ ${D}${libdir}/piglit/
> >>>          cp -Pr generated_tests/ ${D}${libdir}/piglit/
> >>> -       cp -Pr tests/ ${D}${libdir}/piglit/
> >>>          cp -Pr templates/ ${D}${libdir}/piglit/
> >>>
> >>>          sed -i -e
> >>> 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|'
> >>> ${D}${bindir}/piglit-*.py
> >>> @@ -46,3 +46,7 @@ do_install() {
> >>>   FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
> >>>
> >>>   RDEPENDS_${PN} = "python waffle python-json python-subprocess
> >>> python-multiprocessing python-textutils python-netserver python-shell
> >>> mesa-demos"
> >>> +
> >>> +do_install_ptest() {
> >>> +       cp -Pr tests/ ${D}${PTEST_PATH}/
> >>> +}
> >>
> >> Why move the tests directory to the -ptests package?  That makes
> >> piglit unusable without installing piglit-ptest.
> >
> > Hello, if we keep the tests dir in piglit, shall we add perl to
> 
> Sorry, bash, in fact.

A bash dependency on the piglit recipe isn't an issue. Its only an issue
where it forces bash or perl into "small" builds. If you're including
piglit, its not a small build :)

Cheers,

Richard



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-09-02  7:35 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-18  5:39 [PATCH V2 0/1] piglit: enable ptest support Chong Lu
2014-08-18  5:39 ` [PATCH 1/1] " Chong Lu
2014-08-28 14:09   ` Burton, Ross
2014-09-02  2:14     ` Robert Yang
2014-09-02  7:33       ` Robert Yang
2014-09-02  7:35         ` Richard Purdie
  -- strict thread matches above, loose matches on Subject: below --
2014-08-18  3:11 [PATCH 0/1] " Chong Lu
2014-08-18  3:11 ` [PATCH 1/1] " Chong Lu
2014-08-18  5:39   ` Chong Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox