[Piglit] [PATCH 09/18] util/wfl, run.py: Make "xegl" and "x11_egl" select same platform

Dylan Baker baker.dylan.c at gmail.com
Fri Jul 11 11:32:29 PDT 2014


From: Chad Versace <chad.versace at linux.intel.com>

This patch makes PIGLIT_PLATFORM=xegl and PIGLIT_PLATFORM=x11_egl select
the same Waffle platform. Pre-patch, only "x11_egl" was legal.

Why? Because "x11_egl" is clunky, and the meaning of "xegl" is
abundantly clear.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 framework/programs/run.py                             | 2 +-
 tests/util/piglit-framework-gl/piglit_wfl_framework.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/programs/run.py b/framework/programs/run.py
index 61444fa..478e522 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -71,7 +71,7 @@ def run(input_):
                              dest="concurrency",
                              help="Disable concurrent test runs")
     parser.add_argument("-p", "--platform",
-                        choices=["glx", "x11_egl", "wayland", "gbm"],
+                        choices=["glx", "xegl", "x11_egl", "wayland", "gbm"],
                         help="Name of windows system passed to waffle")
     parser.add_argument("-f", "--config",
                         dest="config_file",
diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
index 6476aa3..8072abf 100644
--- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
@@ -89,7 +89,7 @@ piglit_wfl_framework_choose_platform(const struct piglit_gl_test_config *test_co
 #endif
 	}
 
-	else if (streq(env, "x11_egl")) {
+	else if (streq(env, "x11_egl") || streq(env, "xegl")) {
 #if defined(PIGLIT_HAS_X11) && defined(PIGLIT_HAS_EGL)
 		return WAFFLE_PLATFORM_X11_EGL;
 #else
-- 
2.0.0



More information about the Piglit mailing list