summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-05-31 17:56:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-01 11:27:07 +0100
commitdf9f772a2fd8d8ec2ed1feb5f05d7e93cf6cef96 (patch)
treef8db2e706d7f380e0373fb0fab569a97a5602e25
parent815c601db68299d6263f43810f81f4977877128d (diff)
downloadpoky-df9f772a2fd8d8ec2ed1feb5f05d7e93cf6cef96.tar.gz
piglit: upgrade to latest revision
Switch to gitlab.freedesktop.org, as the previous location is now a mirror of that and may be taken down. Remove upstreamed patches. (From OE-Core rev: a109aa96a3c3b8ce3d3e8076955fd72b3a60af77) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch75
-rw-r--r--meta/recipes-graphics/piglit/piglit/format-fix.patch69
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb7
3 files changed, 2 insertions, 149 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
deleted file mode 100644
index 57eda2e207..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1Upstream-Status: Submitted [mailing list]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
5From: Khem Raj <raj.khem@gmail.com>
6Date: Sat, 9 Jul 2016 07:52:19 +0000
7Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
8
9On ARM, musl does not define FE_* when the architecture does not have VFP (which
10is the right interpretation).
11
12As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
13available.
14
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16---
17 tests/general/roundmode-getintegerv.c | 12 ++++++++----
18 tests/general/roundmode-pixelstore.c | 12 ++++++++----
19 2 files changed, 16 insertions(+), 8 deletions(-)
20
21diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
22index 28ecfaf55..aa99044a1 100644
23--- a/tests/general/roundmode-getintegerv.c
24+++ b/tests/general/roundmode-getintegerv.c
25@@ -79,13 +79,17 @@ test(float val, int expect)
26 void
27 piglit_init(int argc, char **argv)
28 {
29- int ret;
30 bool pass = true;
31- ret = fesetround(FE_UPWARD);
32- if (ret != 0) {
33- printf("Couldn't set rounding mode\n");
34+
35+#ifdef FE_UPWARD
36+ if (fesetround(FE_UPWARD) != 0) {
37+ printf("Setting rounding mode failed\n");
38 piglit_report_result(PIGLIT_SKIP);
39 }
40+#else
41+ printf("Cannot set rounding mode\n");
42+ piglit_report_result(PIGLIT_SKIP);
43+#endif
44
45 pass = test(2.2, 2) && pass;
46 pass = test(2.8, 3) && pass;
47diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
48index 8a029b257..57ec11c09 100644
49--- a/tests/general/roundmode-pixelstore.c
50+++ b/tests/general/roundmode-pixelstore.c
51@@ -79,13 +79,17 @@ test(float val, int expect)
52 void
53 piglit_init(int argc, char **argv)
54 {
55- int ret;
56 bool pass = true;
57- ret = fesetround(FE_UPWARD);
58- if (ret != 0) {
59- printf("Couldn't set rounding mode\n");
60+
61+#ifdef FE_UPWARD
62+ if (fesetround(FE_UPWARD) != 0) {
63+ printf("Setting rounding mode failed\n");
64 piglit_report_result(PIGLIT_SKIP);
65 }
66+#else
67+ printf("Cannot set rounding mode\n");
68+ piglit_report_result(PIGLIT_SKIP);
69+#endif
70
71 pass = test(2.2, 2) && pass;
72 pass = test(2.8, 3) && pass;
73--
742.11.0
75
diff --git a/meta/recipes-graphics/piglit/piglit/format-fix.patch b/meta/recipes-graphics/piglit/piglit/format-fix.patch
deleted file mode 100644
index 73d539fef2..0000000000
--- a/meta/recipes-graphics/piglit/piglit/format-fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1Upstream-Status: Submitted [mailing list]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 21 Nov 2018 12:44:36 +0000
7Subject: [PATCH] arb_texture_view: fix security format warnings
8
9If built with -Werror=format-security then Piglit fails to build:
10
11/tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
12error: format not a string literal and no format arguments [-Werror=format-security]
13 (desc)); \
14 ^~~~~~
15
16In this case test->uniform_type is being turned into a string using snprintf()
17and then passed to piglit_report_subtest_result() which takes a format string,
18but GCC can't verify the format.
19
20As _subtest_report() takes a format string, we can just remove the snprintf()
21and let it construct the label.
22
23Also as X is used once and doesn't make the code clearer, just inline it.
24
25Signed-off-by: Ross Burton <ross.burton@intel.com>
26---
27 tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++-------------
28 1 file changed, 6 insertions(+), 13 deletions(-)
29
30diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c
31index 415b01657..86148075b 100644
32--- a/tests/spec/arb_texture_view/rendering-layers-image.c
33+++ b/tests/spec/arb_texture_view/rendering-layers-image.c
34@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
35 return pass;
36 }
37
38-#define X(f, desc) \
39- do { \
40- const bool subtest_pass = (f); \
41- piglit_report_subtest_result(subtest_pass \
42- ? PIGLIT_PASS : PIGLIT_FAIL, \
43- (desc)); \
44- pass = pass && subtest_pass; \
45- } while (0)
46-
47 enum piglit_result
48 piglit_display(void)
49 {
50 bool pass = true;
51 for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
52 const struct test_info *test = &tests[test_idx];
53- char test_name[128];
54- snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type);
55- X(test_render_layers(test), test_name);
56+
57+ const bool subtest_pass = test_render_layers(test);
58+
59+ piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL,
60+ "layers rendering of %s", test->uniform_type);
61+ pass = pass && subtest_pass;
62 }
63-#undef X
64 pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
65 return pass ? PIGLIT_PASS : PIGLIT_FAIL;
66 }
67--
682.11.0
69
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index b6542a191c..4350823f60 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -2,16 +2,13 @@ SUMMARY = "OpenGL driver testing framework"
2LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" 2LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" 3LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
4 4
5SRC_URI = "git://anongit.freedesktop.org/piglit \ 5SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit;protocol=https \
6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \ 6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
8 file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ 7 file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
9 file://format-fix.patch \
10 " 8 "
11UPSTREAM_CHECK_COMMITS = "1" 9UPSTREAM_CHECK_COMMITS = "1"
12 10
13# From 2018-10-26 11SRCREV = "4294b15e3b84a96f24d1286b73d5832eea267bbf"
14SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
15# (when PV goes above 1.0 remove the trailing r) 12# (when PV goes above 1.0 remove the trailing r)
16PV = "1.0+gitr${SRCPV}" 13PV = "1.0+gitr${SRCPV}"
17 14