diff options
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch | 83 |
1 files changed, 52 insertions, 31 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 index f851a92ceb..57eda2e207 100644 --- 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 @@ -1,54 +1,75 @@ -From 0fc2c2932699cfd68be96c820fddfdd79b48b788 Mon Sep 17 00:00:00 2001 +Upstream-Status: Submitted [mailing list] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 9 Jul 2016 07:52:19 +0000 -Subject: [PATCH] tests: Use FE_UPWARD only if its defined in fenv.h - -On ARM, musl does not define FE_* when arch does not have -VFP, (which is right interpretation), therefore check if -its defined before using it +Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present -Fixes errors like +On ARM, musl does not define FE_* when the architecture does not have VFP (which +is the right interpretation). -tests/general/roundmode-pixelstore.c:82:19: error: 'FE_UPWARD' undeclared (first use in this function) - ret = fesetround(FE_UPWARD); - ^~~~~~~~~ +As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't +available. -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> --- -Upstream-Status: Pending - - tests/general/roundmode-getintegerv.c | 2 ++ - tests/general/roundmode-pixelstore.c | 2 ++ - 2 files changed, 4 insertions(+) + 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 28ecfaf..5c27579 100644 +index 28ecfaf55..aa99044a1 100644 --- a/tests/general/roundmode-getintegerv.c +++ b/tests/general/roundmode-getintegerv.c -@@ -81,7 +81,9 @@ piglit_init(int argc, char **argv) +@@ -79,13 +79,17 @@ test(float val, int expect) + void + piglit_init(int argc, char **argv) { - int ret; +- int ret; bool pass = true; +- ret = fesetround(FE_UPWARD); +- if (ret != 0) { +- printf("Couldn't set rounding mode\n"); ++ +#ifdef FE_UPWARD - ret = fesetround(FE_UPWARD); -+#endif - if (ret != 0) { - printf("Couldn't set rounding mode\n"); ++ 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 9284f43..3fcb396 100644 +index 8a029b257..57ec11c09 100644 --- a/tests/general/roundmode-pixelstore.c +++ b/tests/general/roundmode-pixelstore.c -@@ -79,7 +79,9 @@ piglit_init(int argc, char **argv) +@@ -79,13 +79,17 @@ test(float val, int expect) + void + piglit_init(int argc, char **argv) { - int ret; +- int ret; bool pass = true; +- ret = fesetround(FE_UPWARD); +- if (ret != 0) { +- printf("Couldn't set rounding mode\n"); ++ +#ifdef FE_UPWARD - ret = fesetround(FE_UPWARD); -+#endif - if (ret != 0) { - printf("Couldn't set rounding mode\n"); ++ 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; -- -1.8.3.1 +2.11.0 |