summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2017-06-06 19:08:28 +0300
committerAndres Gomez <agomez@igalia.com>2017-06-13 11:46:20 +0300
commitd969c4e7e70ddb9454438ce3348806604c29498b (patch)
treef897e3989ff861196cfafaa19de5b5481e574a69
parent5aeb0136c14b5b7dbad5eef336d40d352a780515 (diff)
Revert "tests: Update integration for khronos CTS runner."
This reverts commit 1f93e29d853c0dc9ee1a22bb7e6366b6eb8d5ac7. This broke backwards compatibility with already released API-specific test sets. Signed-off-by: Andres Gomez <agomez@igalia.com> Tested-by: Mark Janes <mark.a.janes@intel.com> Acked-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r--tests/cts_gl.py20
-rw-r--r--tests/cts_gl45.py2
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/cts_gl.py b/tests/cts_gl.py
index a40b0b369..d650ffd4b 100644
--- a/tests/cts_gl.py
+++ b/tests/cts_gl.py
@@ -69,24 +69,24 @@ class DEQPCTSTest(deqp.DEQPBaseTest):
profile = deqp.make_profile( # pylint: disable=invalid-name
itertools.chain(
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL30-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL30-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL31-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL31-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL32-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL32-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL33-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL33-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL40-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL40-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL41-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL41-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL42-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL42-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL43-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL43-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL44-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL44-CTS-cases.txt', _EXTRA_ARGS)),
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL45-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL45-CTS-cases.txt', _EXTRA_ARGS)),
),
DEQPCTSTest)
diff --git a/tests/cts_gl45.py b/tests/cts_gl45.py
index 580c8760a..2782e18f4 100644
--- a/tests/cts_gl45.py
+++ b/tests/cts_gl45.py
@@ -63,6 +63,6 @@ class DEQPCTSTest(deqp.DEQPBaseTest):
profile = deqp.make_profile( # pylint: disable=invalid-name
itertools.chain(
deqp.iter_deqp_test_cases(
- deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL45-cases.txt', _EXTRA_ARGS)),
+ deqp.gen_caselist_txt(_CTS_BIN, 'GL45-CTS-cases.txt', _EXTRA_ARGS)),
),
DEQPCTSTest)