tests: Align subtest with naming convention

Yeah, historically grown but we should try to be somewhat consistent.
It helps with filtering testcases.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2015-02-06 23:10:26 +01:00
parent bf5035a728
commit 3e9b4e37e6
3 changed files with 12 additions and 12 deletions

View File

@ -725,8 +725,8 @@ run_basic_modes(const struct access_mode *mode,
{ "cpu", cpu_copy_bo, cpu_require }, { "cpu", cpu_copy_bo, cpu_require },
{ "gtt", gtt_copy_bo, gtt_require }, { "gtt", gtt_copy_bo, gtt_require },
{ "wc", wc_copy_bo, wc_require }, { "wc", wc_copy_bo, wc_require },
{ "bcs", blt_copy_bo, bcs_require }, { "blt", blt_copy_bo, bcs_require },
{ "rcs", render_copy_bo, rcs_require }, { "render", render_copy_bo, rcs_require },
{ NULL, NULL } { NULL, NULL }
}, *p; }, *p;
const struct { const struct {

View File

@ -205,7 +205,7 @@ int main(int argc, char **argv)
{ {
igt_subtest_init(argc, argv); igt_subtest_init(argc, argv);
igt_subtest("bcs-vs-rcs-ctx0") { igt_subtest("blt-vs-render-ctx0") {
dri_bo *bcs[1], *rcs[N_CHILD]; dri_bo *bcs[1], *rcs[N_CHILD];
fork_bcs_copy(0x4000, bcs, 1); fork_bcs_copy(0x4000, bcs, 1);
@ -217,7 +217,7 @@ int main(int argc, char **argv)
surfaces_check(rcs, N_CHILD, 0x8000 / N_CHILD); surfaces_check(rcs, N_CHILD, 0x8000 / N_CHILD);
} }
igt_subtest("bcs-vs-rcs-ctxN") { igt_subtest("blt-vs-render-ctxN") {
dri_bo *bcs[1], *rcs[N_CHILD]; dri_bo *bcs[1], *rcs[N_CHILD];
fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, CREATE_CONTEXT); fork_rcs_copy(0x8000 / N_CHILD, rcs, N_CHILD, CREATE_CONTEXT);

View File

@ -1640,12 +1640,12 @@ int main(int argc, char **argv)
"blocking-absolute-wf_vblank" }, "blocking-absolute-wf_vblank" },
{ 60, TEST_VBLANK | TEST_DPMS | TEST_EINVAL, "wf_vblank-vs-dpms" }, { 60, TEST_VBLANK | TEST_DPMS | TEST_EINVAL, "wf_vblank-vs-dpms" },
{ 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_BCS, { 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_BCS,
"bcs-wf_vblank-vs-dpms" }, "blt-wf_vblank-vs-dpms" },
{ 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_RCS, { 60, TEST_VBLANK | TEST_DPMS | TEST_WITH_DUMMY_RCS,
"rcs-wf_vblank-vs-dpms" }, "rcs-wf_vblank-vs-dpms" },
{ 60, TEST_VBLANK | TEST_MODESET | TEST_EINVAL, "wf_vblank-vs-modeset" }, { 60, TEST_VBLANK | TEST_MODESET | TEST_EINVAL, "wf_vblank-vs-modeset" },
{ 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_BCS, { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_BCS,
"bcs-wf_vblank-vs-modeset" }, "blt-wf_vblank-vs-modeset" },
{ 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS,
"rcs-wf_vblank-vs-modeset" }, "rcs-wf_vblank-vs-modeset" },
@ -1657,14 +1657,14 @@ int main(int argc, char **argv)
"plain-flip-fb-recreate" }, "plain-flip-fb-recreate" },
{ 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "bcs-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "rcs-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" },
{ 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" }, { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "bcs-flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "rcs-flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "bcs-flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "rcs-flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" },
{ 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ, { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ,
"flip-vs-expired-vblank" }, "flip-vs-expired-vblank" },