Skip to contentSkip to conversation

piglit: enable ptest support

PATCH Superseded Chong Lu 1 participant 3 messages Aug 18, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chong Lu

author
#0 lore raw

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
author
#1 lore raw

PATCH 1/1 piglit: enable ptest support

Install libpcre test suite and run it as ptest.

---
 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
author
#2 lore raw
Quoted 52 lines · Chong Lu

Install libpcre test suite and run it as ptest.

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

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}/
+}

Please ignore this one, I will resend.

Best Regards
Chong