[Piglit] [Patch v2 11/18] util/wfl, run.py: Allow PIGLIT_PLATFORM="mixed_glx_egl"

[Dylan Baker]

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

If environment variable PIGLIT_PLATFORM is unset, then Piglit defaults
to choosing GLX for GL tests and X/EGL for GLES tests. This patch does
not change the default behavior.

Now PIGLIT_PLATFORM="mixed_glx_egl" explicitly selects that default
behavior.

v2: - Drop xegl name. (Dylan)

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

diff --git a/framework/programs/run.py b/framework/programs/run.py
index eb67d7f..aeab279 100644
--- a/framework/programs/run.py
+++ b/framework/programs/run.py
@@ -71,7 +71,8 @@ def run(input_):
                              dest="concurrency",
                              help="Disable concurrent test runs")
     parser.add_argument("-p", "--platform",
-                        choices=["glx", "x11_egl", "wayland", "gbm"],
+                        choices=["glx", "x11_egl", "wayland", "gbm",
+                                 "mixed_glx_egl"],
                         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 b6ce730..73665f5 100644
--- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Intel Corporation
+ * Copyright © 2012, 2014 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -51,7 +51,7 @@ piglit_wfl_framework_choose_platform(const struct piglit_gl_test_config *test_co
 {
 	const char *env = getenv("PIGLIT_PLATFORM");
 
-	if (env == NULL) {
+	if (env == NULL || streq(env, "mixed_glx_egl")) {
 #if defined(PIGLIT_HAS_X11) && defined(PIGLIT_HAS_EGL)
 		if (test_config->supports_gl_es_version) {
 			/* Some GLX implementations don't support creation of
-- 
2.0.2