flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-19 05:46:25 +00:00
Code Issues Releases Wiki Activity

lib: ensure subtests are not added to simple tests

Browse Source 
Simple tests do not support subtests, so fail if igt_subtest is used in
one.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-11-25 14:10:04 +00:00
parent 3bebf3dd01
commit dbac905600
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/igt_core.c
View File

@ -672,6 +672,7 @@ bool __igt_run_subtest(const char *subtest_name)
{ {
assert(!in_subtest); assert(!in_subtest);
assert(!in_fixture); assert(!in_fixture);
assert(test_with_subtests);
if (list_subtests) { if (list_subtests) {
printf("%s\n", subtest_name); printf("%s\n", subtest_name);

1
lib/tests/.gitignore vendored
View File

@ -5,4 +5,5 @@ igt_no_exit
igt_no_exit_list_only igt_no_exit_list_only
igt_no_subtest igt_no_subtest
igt_simulation igt_simulation
igt_simple_test_subtests
igt_timeout igt_timeout

2
lib/tests/Makefile.sources
View File

@ -5,6 +5,7 @@ check_PROGRAMS = \
igt_list_only \ igt_list_only \
igt_no_subtest \ igt_no_subtest \
igt_simulation \ igt_simulation \
igt_simple_test_subtests \
igt_timeout \ igt_timeout \
$(NULL) $(NULL)
@ -23,5 +24,6 @@ XFAIL_TESTS = \
igt_no_exit \ igt_no_exit \
igt_no_exit_list_only \ igt_no_exit_list_only \
igt_no_subtest \ igt_no_subtest \
igt_simple_test_subtests \
igt_timeout \ igt_timeout \
$(NULL) $(NULL)

31
lib/tests/igt_simple_test_subtests.c Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright © 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#include "igt_core.h"
igt_simple_main
{
igt_subtest("subtest") {
igt_info("Invalid subtest.\n");
}
}