piglit: enable ptest support

PATCH In review Chong Lu 4 participants 6 messages Aug 18, 2014 – Sep 2, 2014

lore

Share & tools

lore

Chong Lu

author

2014-08-18 05:43 UTC #0 lore raw

v2 cover piglit: enable ptest support

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

Signature · 1 line

1.9.1

Chong Lu

author

2014-08-18 05:43 UTC #1 lore raw

PATCH v2 1/1 piglit: enable ptest support

Install piglit test suite and run it as ptest.

Signed-off-by Chong Lu <[email protected]>

---
 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

meta/recipes-graphics/piglit/piglit/run-ptest new file +5 -0

new file mode 100644
index 0000000..fba2e8d
@@ -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:|'

meta/recipes-graphics/piglit/piglit_git.bb +7 -3

index 5c013ef..de4a839 100644
@@ -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}/
+}

Signature · 1 line

1.9.1

Burton, Ross

2014-08-28 14:09 UTC #2 lore raw

Quoted 1 line · Chong Lu

+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.

Quoted 9 lines

meta/recipes-graphics/piglit/piglit_git.bb +0 -1

@@ -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

meta/recipes-graphics/piglit/piglit_git.bb do_install() { · line 52

Quoted 7 lines

meta/recipes-graphics/piglit/piglit_git.bb +4 -0

@@ -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

Robert Yang

2014-09-02 02:14 UTC #3 lore raw

Quoted 19 lines · Ross

Quoted 1 line · Chong Lu
+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.
Quoted 11 lines
meta/recipes-graphics/piglit/piglit_git.bb +0 -1
@@ -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/"
 

Quoted 8 lines

meta/recipes-graphics/piglit/piglit_git.bb do_install() { · line 52
Quoted 5 lines
meta/recipes-graphics/piglit/piglit_git.bb +4 -0
  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

Quoted 6 lines

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

Robert Yang

2014-09-02 07:33 UTC #4 lore raw

Quoted 36 lines · Robert Yang

Quoted 22 lines · Ross
Quoted 2 lines · Chong Lu
+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.
Quoted 13 lines
meta/recipes-graphics/piglit/piglit_git.bb +0 -1
@@ -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
meta/recipes-graphics/piglit/piglit_git.bb +0 -0
@@ -46,3 +46,7 @@ do_install() {
  FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
 
Quoted 10 lines
meta/recipes-graphics/piglit/piglit_git.bb do_install() { · line 52
Quoted 7 lines
(quoted diff) +0 -0
  RDEPENDS_${PN} = "python waffle python-json python-subprocess
python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
meta/recipes-graphics/piglit/piglit_git.bb +4 -0
+
+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.

Quoted 1 line

Hello, if we keep the tests dir in piglit, shall we add perl to

Sorry, bash, in fact.

// Robert

Quoted 10 lines

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

Richard Purdie

2014-09-02 07:35 UTC #5 lore raw

Quoted 38 lines · Robert Yang

Quoted 36 lines · Robert Yang
Quoted 32 lines · Ross
Quoted 2 lines · Chong Lu
+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.
Quoted 16 lines
meta/recipes-graphics/piglit/piglit_git.bb +0 -1
@@ -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
meta/recipes-graphics/piglit/piglit_git.bb +0 -0
@@ -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"
meta/recipes-graphics/piglit/piglit_git.bb do_install() { · line 52
Quoted 4 lines
meta/recipes-graphics/piglit/piglit_git.bb +4 -0
+
+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.

Quoted 3 lines

Quoted 1 line
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