Re: [OE-core] [PATCH 1/2] piglit: upgrade to latest revision
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 On Thu, 23 May 2019 at 14:23, Burton, Ross wrote: > > Can you file a bug to get devtool to state that in the commit message? > > Ross > > On Thu, 23 May 2019 at 10:27, Alexander Kanavin > wrote: > > > > Yes. If devtool drops them, then they are already in the code. > > > > Alex > > > > On Thu, 23 May 2019 at 03:30, Khem Raj wrote: > > > > > > On Wed, May 22, 2019 at 4:02 AM Alexander Kanavin > > > wrote: > > > > > > > > Signed-off-by: Alexander Kanavin > > > > --- > > > > ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 --- > > > > .../piglit/piglit/format-fix.patch| 69 - > > > > > > are these patches upstreamed ? > > > > > > > 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 > > > > > > > > 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 57eda2e207b..000 > > > > --- > > > > 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 @@ > > > > -Upstream-Status: Submitted [mailing list] > > > > -Signed-off-by: Ross Burton > > > > - > > > > -From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001 > > > > -From: Khem Raj > > > > -Date: Sat, 9 Jul 2016 07:52:19 + > > > > -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 > > > > > > > > - 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 > > > > - > > > > 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 73d539fef27..000 > > > > --- a/meta/recipes-graphics/piglit/piglit/format-fix.patch > > > > +++
Re: [OE-core] [PATCH 1/2] piglit: upgrade to latest revision
Can you file a bug to get devtool to state that in the commit message? Ross On Thu, 23 May 2019 at 10:27, Alexander Kanavin wrote: > > Yes. If devtool drops them, then they are already in the code. > > Alex > > On Thu, 23 May 2019 at 03:30, Khem Raj wrote: > > > > On Wed, May 22, 2019 at 4:02 AM Alexander Kanavin > > wrote: > > > > > > Signed-off-by: Alexander Kanavin > > > --- > > > ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 --- > > > .../piglit/piglit/format-fix.patch| 69 - > > > > are these patches upstreamed ? > > > > > 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 > > > > > > 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 57eda2e207b..000 > > > --- > > > 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 @@ > > > -Upstream-Status: Submitted [mailing list] > > > -Signed-off-by: Ross Burton > > > - > > > -From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001 > > > -From: Khem Raj > > > -Date: Sat, 9 Jul 2016 07:52:19 + > > > -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 > > > > > > - 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 > > > - > > > 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 73d539fef27..000 > > > --- a/meta/recipes-graphics/piglit/piglit/format-fix.patch > > > +++ /dev/null > > > @@ -1,69 +0,0 @@ > > > -Upstream-Status: Submitted [mailing list] > > > -Signed-off-by: Ross Burton > > > - > > > -From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001 > > > -From: Ross Burton > > > -Date: Wed, 21 Nov 2018 12:44:36 + > > > -Subject: [PATCH] arb_texture_view: fix security format warnings > > > - > > > -If built with -Werror=format-security then Piglit fails to build: > > > - > > >
Re: [OE-core] [PATCH 1/2] piglit: upgrade to latest revision
Yes. If devtool drops them, then they are already in the code. Alex On Thu, 23 May 2019 at 03:30, Khem Raj wrote: > > On Wed, May 22, 2019 at 4:02 AM Alexander Kanavin > wrote: > > > > Signed-off-by: Alexander Kanavin > > --- > > ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 --- > > .../piglit/piglit/format-fix.patch| 69 - > > are these patches upstreamed ? > > > 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 > > > > 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 57eda2e207b..000 > > --- > > 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 @@ > > -Upstream-Status: Submitted [mailing list] > > -Signed-off-by: Ross Burton > > - > > -From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj > > -Date: Sat, 9 Jul 2016 07:52:19 + > > -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 > > > > - 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 > > - > > 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 73d539fef27..000 > > --- a/meta/recipes-graphics/piglit/piglit/format-fix.patch > > +++ /dev/null > > @@ -1,69 +0,0 @@ > > -Upstream-Status: Submitted [mailing list] > > -Signed-off-by: Ross Burton > > - > > -From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001 > > -From: Ross Burton > > -Date: Wed, 21 Nov 2018 12:44:36 + > > -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. > > - > >
Re: [OE-core] [PATCH 1/2] piglit: upgrade to latest revision
On Wed, May 22, 2019 at 4:02 AM Alexander Kanavin wrote: > > Signed-off-by: Alexander Kanavin > --- > ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 --- > .../piglit/piglit/format-fix.patch| 69 - are these patches upstreamed ? > 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 > > 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 57eda2e207b..000 > --- > 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 @@ > -Upstream-Status: Submitted [mailing list] > -Signed-off-by: Ross Burton > - > -From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Sat, 9 Jul 2016 07:52:19 + > -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 > > - 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 > - > 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 73d539fef27..000 > --- a/meta/recipes-graphics/piglit/piglit/format-fix.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -Upstream-Status: Submitted [mailing list] > -Signed-off-by: Ross Burton > - > -From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001 > -From: Ross Burton > -Date: Wed, 21 Nov 2018 12:44:36 + > -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 > > - tests/spec/arb_texture_view/rendering-layers-image.c | 19 > ++- > - 1 file changed, 6 insertions(+), 13 deletions(-) > - > -diff