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

tests: Separate tests with lots of subtests

Browse Source 
Currently, when trying to run i-g-t tests with piglit, it takes up
to 20s until the first test is executed.
The main reason is that gem_concurrent_all has ~500k subtests,
overkilling piglit.

This patch separates gem_concurrent_* tests from the rest of the tests,
creating two files test-list.txt and test-list-full.txt.
The piglit can now enumerate the i-g-t tests within a decent few seconds.
The second list could be used when trying to execute specific these tests.

v2: Rebased

Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com>
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
This commit is contained in:
Feceoru, Gabriel 2016-04-20 17:21:58 +03:00 committed by Marius Vlad
parent 3450cba30e
commit a633ad03c6
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Makefile.am
View File

@ -14,6 +14,12 @@ test-list.txt: Makefile.sources
@echo ${single_kernel_tests} ${multi_kernel_tests} >> $@ @echo ${single_kernel_tests} ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@ @echo END TESTLIST >> $@
test-list-full.txt: Makefile.sources
@echo TESTLIST > $@
@echo ${single_kernel_tests} ${multi_kernel_tests} ${extra_multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
noinst_PROGRAMS = \ noinst_PROGRAMS = \
$(HANG) \ $(HANG) \
$(TESTS_testsuite) \ $(TESTS_testsuite) \
@ -38,14 +44,14 @@ dist_pkgdata_DATA = \
all-local: .gitignore all-local: .gitignore
.gitignore: Makefile.sources .gitignore: Makefile.sources
@echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@ @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@
pkgdata_DATA = test-list.txt pkgdata_DATA = test-list.txt test-list-full.txt
EXTRA_PROGRAMS = $(HANG) EXTRA_PROGRAMS = $(HANG)
EXTRA_DIST = $(common_files) EXTRA_DIST = $(common_files)
CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt .gitignore CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
-I$(srcdir)/.. \ -I$(srcdir)/.. \

22
tests/Makefile.sources
View File

@ -20,8 +20,6 @@ TESTS_progs_M = \
gem_busy \ gem_busy \
gem_caching \ gem_caching \
gem_close_race \ gem_close_race \
gem_concurrent_blit \
gem_concurrent_all \
gem_create \ gem_create \
gem_cs_tlb \ gem_cs_tlb \
gem_ctx_bad_exec \ gem_ctx_bad_exec \
@ -117,6 +115,11 @@ TESTS_progs_M = \
template \ template \
$(NULL) $(NULL)
TESTS_progs_XM = \
gem_concurrent_blit \
gem_concurrent_all \
$(NULL)
TESTS_progs = \ TESTS_progs = \
core_auth \ core_auth \
core_getclient \ core_getclient \
@ -219,6 +222,15 @@ multi_kernel_tests = \
$(TESTS_scripts_M) \ $(TESTS_scripts_M) \
$(NULL) $(NULL)
# This target contains testcases with lots of subtests.
# It was split from multi_kernel_tests because of the overhead of listing all
# the subtests in piglit
extra_multi_kernel_tests = \
$(TESTS_progs_XM) \
$(NULL)
# This target is for simple testcase which don't expose any subtest. # This target is for simple testcase which don't expose any subtest.
# #
# Your testcase should probably use igt_simple_main, but none of the other magic # Your testcase should probably use igt_simple_main, but none of the other magic
@ -233,6 +245,12 @@ kernel_tests = \
$(multi_kernel_tests) \ $(multi_kernel_tests) \
$(NULL) $(NULL)
kernel_tests_full = \
$(single_kernel_tests) \
$(multi_kernel_tests) \
$(extra_multi_kernel_tests) \
$(NULL)
# Test that exercise specific asserts in the test framework library and are # Test that exercise specific asserts in the test framework library and are
# hence expected to fail. # hence expected to fail.
XFAIL_TESTS = \ XFAIL_TESTS = \