From a5425a101cd38941961c13f97b56aa0683f64f8e Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Wed, 19 Nov 2014 15:44:00 +0000 Subject: docs: add a glossary of test name terms Add a glossary of test name terms based on the details in tests/NAMING-CONVENTION. Signed-off-by: Thomas Wood --- docs/reference/intel-gpu-tools/Makefile.am | 10 +- .../intel-gpu-tools/igt_test_programs.xml | 106 +++++++++++++++++++++ lib/igt_core.c | 14 +-- 3 files changed, 115 insertions(+), 15 deletions(-) diff --git a/docs/reference/intel-gpu-tools/Makefile.am b/docs/reference/intel-gpu-tools/Makefile.am index d7ef4dfc..b40680bd 100644 --- a/docs/reference/intel-gpu-tools/Makefile.am +++ b/docs/reference/intel-gpu-tools/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in TESTLISTS = $(top_builddir)/tests/single-tests.txt $(top_builddir)/tests/multi-tests.txt +KEYWORDS = (hang|swap|thrash|crc|tiled|tiling|rte|ctx|exec|rpm) + xml/igt_test_programs_%_programs.xml: $(TESTLISTS) mkdir -p `dirname $@` echo "" > $@ @@ -32,7 +34,9 @@ xml/igt_test_programs_%_description.xml: $(TESTLISTS) echo "" >> $@ echo "Description" >> $@ for test in `cat $(TESTLISTS) | tr ' ' '\n' | grep "^$*" | sort`; do \ - echo "$$test" >> $@; \ + echo "" >> $@; \ + echo "$$test" | perl -pe 's/(?<=_)$(KEYWORDS)(?=(_|\W))/<acronym>\1<\/acronym>/g' >> $@; \ + echo "" >> $@; \ if [ -x $(top_builddir)/tests/$$test ]; then \ testprog=$(top_builddir)/tests/$$test; \ else \ @@ -44,7 +48,9 @@ xml/igt_test_programs_%_description.xml: $(TESTLISTS) echo "Subtests" >> $@; \ echo "" >> $@; \ for subtest in `./$$testprog --list-subtests`; do \ - echo "$$subtest" >> $@; \ + echo "" >> $@; \ + echo "$$subtest" | perl -pe 's/\b$(KEYWORDS)\b/\1<\/acronym>/g' >> $@; \ + echo "" >> $@; \ done; \ echo "" >> $@; \ fi; \ diff --git a/docs/reference/intel-gpu-tools/igt_test_programs.xml b/docs/reference/intel-gpu-tools/igt_test_programs.xml index 07285fe7..970ecb9c 100644 --- a/docs/reference/intel-gpu-tools/igt_test_programs.xml +++ b/docs/reference/intel-gpu-tools/igt_test_programs.xml @@ -187,4 +187,110 @@ + + + Gloassary + + The following terms are commonly used in test names to describe + various features of the test and can be used to filter and select + particular tests. + + + hang + + Tests that provoke gpu hangs. + + + + + swap + + Tests that force their full working sets through swap. + + + + + thrash + + Tests that tend to have really slow forward progress due to gtt/memory/.. thrashing. + + + + + crc + + Tests that use the display CRC infrastructure to check the results. + + + + + tiled + + Tests that exercise behaviour on tiled buffers. + + + + + tiling + + Tests that exercise behaviour on tiled buffers. + + + + + rte + + Runtime enviroment checks. + + + + + ctx + + Tests that exercise the hardware context support. + + + + + render + + Tests which apply to the render ring. + + + + + blt + + Tests which apply to the blt ring. + + + + + bsd + + Tests which apply to the bsd ring. + + + + + vebox + + Tests which apply to the vebox ring. + + + + + exec + + Tests that exercise the execbuf code in various ways. + + + + + rpm + + Runtime power management tests. + + + diff --git a/lib/igt_core.c b/lib/igt_core.c index 3fd45952..13a52a5a 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1433,20 +1433,8 @@ void igt_log(enum igt_log_level level, const char *format, ...) { va_list args; - assert(format); - - if (list_subtests) - return; - - if (igt_log_level > level) - return; - va_start(args, format); - if (level == IGT_LOG_WARN) { - fflush(stdout); - vfprintf(stderr, format, args); - } else - vprintf(format, args); + igt_vlog(level, format, args); va_end(args); } -- cgit v1.2.3