[Piglit] [PATCH 2/2] framework: Add required option to deqp bin variables

[Dylan Baker]

This makes the deqp derived profiles error out with a helpful (rather
than confusing message) if the binary isn't set via the conf option or
the environment variable. It does not stop those setting from being
wrong, however.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/cts_gl.py      | 3 ++-
 tests/cts_gles.py    | 3 ++-
 tests/deqp_gles2.py  | 3 ++-
 tests/deqp_gles3.py  | 3 ++-
 tests/deqp_gles31.py | 3 ++-
 tests/deqp_vk.py     | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/cts_gl.py b/tests/cts_gl.py
index caefa1a..d650ffd 100644
--- a/tests/cts_gl.py
+++ b/tests/cts_gl.py
@@ -50,7 +50,8 @@ from framework.test import deqp
 
 __all__ = ['profile']
 
-_CTS_BIN = deqp.get_option('PIGLIT_CTS_GL_BIN', ('cts_gl', 'bin'))
+_CTS_BIN = deqp.get_option('PIGLIT_CTS_GL_BIN', ('cts_gl', 'bin'),
+                           required=True)
 
 _EXTRA_ARGS = deqp.get_option('PIGLIT_CTS_GL_EXTRA_ARGS', ('cts_gl', 'extra_args'),
                               default='').split()
diff --git a/tests/cts_gles.py b/tests/cts_gles.py
index 983c694..64de79d 100644
--- a/tests/cts_gles.py
+++ b/tests/cts_gles.py
@@ -51,7 +51,8 @@ from framework.test import deqp
 
 __all__ = ['profile']
 
-_CTS_BIN = deqp.get_option('PIGLIT_CTS_GLES_BIN', ('cts_gles', 'bin'))
+_CTS_BIN = deqp.get_option('PIGLIT_CTS_GLES_BIN', ('cts_gles', 'bin'),
+                           required=True)
 
 _EXTRA_ARGS = deqp.get_option('PIGLIT_CTS_GLES_EXTRA_ARGS', ('cts_gles', 'extra_args'),
                               default='').split()
diff --git a/tests/deqp_gles2.py b/tests/deqp_gles2.py
index ab897bd..4a83e16 100644
--- a/tests/deqp_gles2.py
+++ b/tests/deqp_gles2.py
@@ -30,7 +30,8 @@ __all__ = ['profile']
 
 # Path to the deqp-gles2 executable.
 _DEQP_GLES2_BIN = deqp.get_option('PIGLIT_DEQP_GLES2_BIN',
-                                  ('deqp-gles2', 'bin'))
+                                  ('deqp-gles2', 'bin'),
+                                  required=True)
 
 _EXTRA_ARGS = deqp.get_option('PIGLIT_DEQP_GLES2_EXTRA_ARGS',
                               ('deqp-gles2', 'extra_args'),
diff --git a/tests/deqp_gles3.py b/tests/deqp_gles3.py
index 783407d..9bfc7a9 100644
--- a/tests/deqp_gles3.py
+++ b/tests/deqp_gles3.py
@@ -32,7 +32,8 @@ __all__ = ['profile']
 
 # Path to the deqp-gles3 executable.
 _DEQP_GLES3_EXE = deqp.get_option('PIGLIT_DEQP_GLES3_EXE',
-                                  ('deqp-gles3', 'exe'))
+                                  ('deqp-gles3', 'exe'),
+                                  required=True)
 
 # Path to the xml file which contained the case list of the subset of dEQP
 # and marked as must pass in CTS.
diff --git a/tests/deqp_gles31.py b/tests/deqp_gles31.py
index f516a84..51188c7 100644
--- a/tests/deqp_gles31.py
+++ b/tests/deqp_gles31.py
@@ -30,7 +30,8 @@ __all__ = ['profile']
 
 # Path to the deqp-gles3 executable.
 _DEQP_GLES31_BIN = deqp.get_option('PIGLIT_DEQP_GLES31_BIN',
-                                   ('deqp-gles31', 'bin'))
+                                   ('deqp-gles31', 'bin'),
+                                   required=True)
 
 _EXTRA_ARGS = deqp.get_option('PIGLIT_DEQP_GLES31_EXTRA_ARGS',
                               ('deqp-gles31', 'extra_args'),
diff --git a/tests/deqp_vk.py b/tests/deqp_vk.py
index f968179..4df9e3b 100644
--- a/tests/deqp_vk.py
+++ b/tests/deqp_vk.py
@@ -35,7 +35,8 @@ __all__ = ['profile']
 
 # Path to the deqp-gles3 executable.
 _DEQP_VK_BIN = deqp.get_option('PIGLIT_DEQP_VK_BIN',
-                               ('deqp-vk', 'bin'))
+                               ('deqp-vk', 'bin'),
+                               required=True)
 
 _EXTRA_ARGS = deqp.get_option('PIGLIT_DEQP_VK_EXTRA_ARGS',
                               ('deqp-vk', 'extra_args'),
-- 
2.9.0