Skip to contentSkip to conversation

piglit: upgrade to latest revision

PATCH In review Alexander Kanavin 3 participants 6 messages May 22, 2019 – May 23, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 piglit: upgrade to latest revision

---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------
 meta/recipes-graphics/piglit/piglit_git.bb    |  5 +-
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--	int ret;
- 	bool pass = true;
--	ret = fesetround(FE_UPWARD);
--	if (ret != 0) {
--		printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+	if (fesetround(FE_UPWARD) != 0) {
-+		printf("Setting rounding mode failed\n");
- 		piglit_report_result(PIGLIT_SKIP);
- 	}
-+#else
-+	printf("Cannot set rounding mode\n");
-+	piglit_report_result(PIGLIT_SKIP);
-+#endif
- 
- 	pass = test(2.2, 2) && pass;
- 	pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--	int ret;
- 	bool pass = true;
--	ret = fesetround(FE_UPWARD);
--	if (ret != 0) {
--		printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+	if (fesetround(FE_UPWARD) != 0) {
-+		printf("Setting rounding mode failed\n");
- 		piglit_report_result(PIGLIT_SKIP);
- 	}
-+#else
-+	printf("Cannot set rounding mode\n");
-+	piglit_report_result(PIGLIT_SKIP);
-+#endif
- 
- 	pass = test(2.2, 2) && pass;
- 	pass = test(2.8, 3) && pass;
--- 
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69

69 lines not on this page · raw message

meta/recipes-graphics/piglit/piglit_git.bb +1 -4
index b6542a191cf..97ebd96619e 100644
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "ac955893c92591c4542439665cae2c3fb79de9dd"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 iproute2: upgrade 5.0.0 -> 5.1.0

---
 .../iproute2/{iproute2_5.0.0.bb => iproute2_5.1.0.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/iproute2/{iproute2_5.0.0.bb => iproute2_5.1.0.bb} (68%)
meta/recipes-connectivity/iproute2/iproute2_5.1.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb +2 -2
similarity index 68%
rename from meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.1.0.bb
index 8f33c7fe194..6854a130042 100644
@@ -5,8 +5,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
            file://0001-libc-compat.h-add-musl-workaround.patch \
           "
 
-SRC_URI[md5sum] = "d22107b4d7cfb999eeb8ad8a0aec1124"
-SRC_URI[sha256sum] = "df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba"
+SRC_URI[md5sum] = "a2b8349abf4ae00e92155fda22de4d5e"
+SRC_URI[sha256sum] = "dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf"
 
 # CFLAGS are computed in Makefile and reference CCOPTS
 #
Signature · 1 line
2.17.1
#2 lore raw
In reply to Alexander Kanavin
Quoted 5 lines · Alexander Kanavin
---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------

are these patches upstreamed ?

Quoted 189 lines
 meta/recipes-graphics/piglit/piglit_git.bb    |  5 +-
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69
deleted file mode 100644
index 73d539fef27..00000000000
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 21 Nov 2018 12:44:36 +0000
-Subject: [PATCH] arb_texture_view: fix security format warnings
-
-If built with -Werror=format-security then Piglit fails to build:
-
-/tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
-error: format not a string literal and no format arguments [-Werror=format-security]
-         (desc)); \
-         ^~~~~~
-
-In this case test->uniform_type is being turned into a string using snprintf()
-and then passed to piglit_report_subtest_result() which takes a format string,
-but GCC can't verify the format.
-
-As _subtest_report() takes a format string, we can just remove the snprintf()
-and let it construct the label.
-
-Also as X is used once and doesn't make the code clearer, just inline it.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c
-index 415b01657..86148075b 100644
---- a/tests/spec/arb_texture_view/rendering-layers-image.c
-+++ b/tests/spec/arb_texture_view/rendering-layers-image.c
-@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
-       return pass;
- }
-
--#define X(f, desc) \
--      do { \
--              const bool subtest_pass = (f); \
--              piglit_report_subtest_result(subtest_pass \
--                                               ? PIGLIT_PASS : PIGLIT_FAIL, \
--                                               (desc)); \
--              pass = pass && subtest_pass; \
--      } while (0)
--
- enum piglit_result
- piglit_display(void)
- {
-       bool pass = true;
-       for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
-               const struct test_info *test = &tests[test_idx];
--              char test_name[128];
--              snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type);
--              X(test_render_layers(test), test_name);
-+
-+              const bool subtest_pass = test_render_layers(test);
-+
-+              piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL,
-+                                           "layers rendering of %s", test->uniform_type);
-+              pass = pass && subtest_pass;
-       }
--#undef X
-       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
- }
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb +1 -5
index b6542a191cf..97ebd96619e 100644
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "ac955893c92591c4542439665cae2c3fb79de9dd"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Yes. If devtool drops them, then they are already in the code.

Alex

Quoted 200 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------

are these patches upstreamed ?

Quoted 189 lines
 meta/recipes-graphics/piglit/piglit_git.bb    |  5 +-
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69
deleted file mode 100644
index 73d539fef27..00000000000
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 21 Nov 2018 12:44:36 +0000
-Subject: [PATCH] arb_texture_view: fix security format warnings
-
-If built with -Werror=format-security then Piglit fails to build:
-
-/tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
-error: format not a string literal and no format arguments [-Werror=format-security]
-         (desc)); \
-         ^~~~~~
-
-In this case test->uniform_type is being turned into a string using snprintf()
-and then passed to piglit_report_subtest_result() which takes a format string,
-but GCC can't verify the format.
-
-As _subtest_report() takes a format string, we can just remove the snprintf()
-and let it construct the label.
-
-Also as X is used once and doesn't make the code clearer, just inline it.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c
-index 415b01657..86148075b 100644
---- a/tests/spec/arb_texture_view/rendering-layers-image.c
-+++ b/tests/spec/arb_texture_view/rendering-layers-image.c
-@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
-       return pass;
- }
-
--#define X(f, desc) \
--      do { \
--              const bool subtest_pass = (f); \
--              piglit_report_subtest_result(subtest_pass \
--                                               ? PIGLIT_PASS : PIGLIT_FAIL, \
--                                               (desc)); \
--              pass = pass && subtest_pass; \
--      } while (0)
--
- enum piglit_result
- piglit_display(void)
- {
-       bool pass = true;
-       for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
-               const struct test_info *test = &tests[test_idx];
--              char test_name[128];
--              snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type);
--              X(test_render_layers(test), test_name);
-+
-+              const bool subtest_pass = test_render_layers(test);
-+
-+              piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL,
-+                                           "layers rendering of %s", test->uniform_type);
-+              pass = pass && subtest_pass;
-       }
--#undef X
-       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
- }
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb +1 -5
index b6542a191cf..97ebd96619e 100644
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "ac955893c92591c4542439665cae2c3fb79de9dd"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#4 lore raw

Can you file a bug to get devtool to state that in the commit message?

Ross

Quoted 211 lines · Alexander Kanavin

Yes. If devtool drops them, then they are already in the code.

Alex

Quoted 192 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------

are these patches upstreamed ?

Quoted 181 lines
 meta/recipes-graphics/piglit/piglit_git.bb    |  5 +-
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69
deleted file mode 100644
index 73d539fef27..00000000000
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 21 Nov 2018 12:44:36 +0000
-Subject: [PATCH] arb_texture_view: fix security format warnings
-
-If built with -Werror=format-security then Piglit fails to build:
-
-/tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
-error: format not a string literal and no format arguments [-Werror=format-security]
-         (desc)); \
-         ^~~~~~
-
-In this case test->uniform_type is being turned into a string using snprintf()
-and then passed to piglit_report_subtest_result() which takes a format string,
-but GCC can't verify the format.
-
-As _subtest_report() takes a format string, we can just remove the snprintf()
-and let it construct the label.
-
-Also as X is used once and doesn't make the code clearer, just inline it.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c
-index 415b01657..86148075b 100644
---- a/tests/spec/arb_texture_view/rendering-layers-image.c
-+++ b/tests/spec/arb_texture_view/rendering-layers-image.c
-@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
-       return pass;
- }
-
--#define X(f, desc) \
--      do { \
--              const bool subtest_pass = (f); \
--              piglit_report_subtest_result(subtest_pass \
--                                               ? PIGLIT_PASS : PIGLIT_FAIL, \
--                                               (desc)); \
--              pass = pass && subtest_pass; \
--      } while (0)
--
- enum piglit_result
- piglit_display(void)
- {
-       bool pass = true;
-       for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
-               const struct test_info *test = &tests[test_idx];
--              char test_name[128];
--              snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type);
--              X(test_render_layers(test), test_name);
-+
-+              const bool subtest_pass = test_render_layers(test);
-+
-+              piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL,
-+                                           "layers rendering of %s", test->uniform_type);
-+              pass = pass && subtest_pass;
-       }
--#undef X
-       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
- }
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb +1 -4
index b6542a191cf..97ebd96619e 100644
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "ac955893c92591c4542439665cae2c3fb79de9dd"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Quoted 8 lines
Quoted 8 lines

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw

Devtool does not create commits; it's up to the developer and/or AUH. I wouldn't necessarily want AUH to try to auto-explain the changes, as it's worse than no explanation imo :)

Alex

Quoted 217 lines · Ross

Can you file a bug to get devtool to state that in the commit message?

Ross

Quoted 211 lines · Alexander Kanavin

Yes. If devtool drops them, then they are already in the code.

Alex

Quoted 192 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------

are these patches upstreamed ?

Quoted 181 lines
 meta/recipes-graphics/piglit/piglit_git.bb    |  5 +-
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--      int ret;
-       bool pass = true;
--      ret = fesetround(FE_UPWARD);
--      if (ret != 0) {
--              printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+      if (fesetround(FE_UPWARD) != 0) {
-+              printf("Setting rounding mode failed\n");
-               piglit_report_result(PIGLIT_SKIP);
-       }
-+#else
-+      printf("Cannot set rounding mode\n");
-+      piglit_report_result(PIGLIT_SKIP);
-+#endif
-
-       pass = test(2.2, 2) && pass;
-       pass = test(2.8, 3) && pass;
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69
deleted file mode 100644
index 73d539fef27..00000000000
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 21 Nov 2018 12:44:36 +0000
-Subject: [PATCH] arb_texture_view: fix security format warnings
-
-If built with -Werror=format-security then Piglit fails to build:
-
-/tests/spec/arb_texture_view/rendering-layers-image.c:150:8:
-error: format not a string literal and no format arguments [-Werror=format-security]
-         (desc)); \
-         ^~~~~~
-
-In this case test->uniform_type is being turned into a string using snprintf()
-and then passed to piglit_report_subtest_result() which takes a format string,
-but GCC can't verify the format.
-
-As _subtest_report() takes a format string, we can just remove the snprintf()
-and let it construct the label.
-
-Also as X is used once and doesn't make the code clearer, just inline it.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c
-index 415b01657..86148075b 100644
---- a/tests/spec/arb_texture_view/rendering-layers-image.c
-+++ b/tests/spec/arb_texture_view/rendering-layers-image.c
-@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test)
-       return pass;
- }
-
--#define X(f, desc) \
--      do { \
--              const bool subtest_pass = (f); \
--              piglit_report_subtest_result(subtest_pass \
--                                               ? PIGLIT_PASS : PIGLIT_FAIL, \
--                                               (desc)); \
--              pass = pass && subtest_pass; \
--      } while (0)
--
- enum piglit_result
- piglit_display(void)
- {
-       bool pass = true;
-       for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) {
-               const struct test_info *test = &tests[test_idx];
--              char test_name[128];
--              snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type);
--              X(test_render_layers(test), test_name);
-+
-+              const bool subtest_pass = test_render_layers(test);
-+
-+              piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL,
-+                                           "layers rendering of %s", test->uniform_type);
-+              pass = pass && subtest_pass;
-       }
--#undef X
-       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
- }
---
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb +1 -4
index b6542a191cf..97ebd96619e 100644
@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
 SRC_URI = "git://anongit.freedesktop.org/piglit \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "ac955893c92591c4542439665cae2c3fb79de9dd"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Quoted 8 lines
Quoted 8 lines

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core