Move library selftests to lib/tests

Again they're not really igt testcases so are in the way of
running spatch unconditionally. Move them someplace else.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-10-27 15:08:50 +01:00
parent 9d6a2cacf6
commit 685e57736a
15 changed files with 59 additions and 26 deletions

View File

@ -216,6 +216,7 @@ AC_CONFIG_FILES([
docs/reference/intel-gpu-tools/Makefile
docs/reference/intel-gpu-tools/version.xml
lib/Makefile
lib/tests/Makefile
man/Makefile
scripts/Makefile
tests/Makefile

View File

@ -1,6 +1,8 @@
IGT_LIB_PATH := $(builddir)
GPU_TOOLS_PATH := $(top_srcdir)
SUBDIRS = tests
include Makefile.sources
noinst_LTLIBRARIES = libintel_tools.la

7
lib/tests/.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
# Please keep sorted alphabetically
igt_fork_helper
igt_list_only
igt_no_exit
igt_no_exit_list_only
igt_no_subtest
igt_simulation

18
lib/tests/Makefile.am Normal file
View File

@ -0,0 +1,18 @@
include Makefile.sources
EXTRA_PROGRAMS = $(TESTS_testsuite)
EXTRA_DIST = $(TESTS_scripts)
CLEANFILES = $(EXTRA_PROGRAMS)
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
-I$(srcdir)/../.. \
-I$(srcdir)/.. \
-include "$(srcdir)/../../lib/check-ndebug.h" \
-DIGT_DATADIR=\""$(abs_srcdir)"\" \
$(NULL)
LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS)
LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS)
AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)

View File

@ -0,0 +1,29 @@
noinst_PROGRAMS = \
$(TESTS_testsuite) \
$(NULL)
TESTS_testsuite = \
igt_no_exit \
igt_no_exit_list_only \
igt_fork_helper \
igt_list_only \
igt_no_subtest \
igt_simulation \
$(NULL)
TESTS_testsuite_scripts = \
igt_command_line.sh \
$(NULL)
TESTS = \
$(TESTS_testsuite) \
$(TESTS_testsuite_scripts) \
$(NULL)
# Test that exercise specific asserts in the test framework library and are
# hence expected to fail.
XFAIL_TESTS = \
igt_no_exit \
igt_no_exit_list_only \
igt_no_subtest \
$(NULL)

6
tests/.gitignore vendored
View File

@ -112,12 +112,6 @@ gen3_render_mixed_blits
gen3_render_tiledx_blits
gen3_render_tiledy_blits
gen7_forcewake_mt
igt_fork_helper
igt_list_only
igt_no_exit
igt_no_exit_list_only
igt_no_subtest
igt_simulation
kms_3d
kms_addfb
kms_cursor_crc

View File

@ -27,8 +27,8 @@ multi-tests.txt: Makefile.sources
@echo ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite)
EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
EXTRA_DIST = $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt

View File

@ -191,24 +191,6 @@ kernel_tests = \
$(multi_kernel_tests) \
$(NULL)
TESTS_testsuite = \
igt_no_exit \
igt_no_exit_list_only \
igt_fork_helper \
igt_list_only \
igt_no_subtest \
igt_simulation \
$(NULL)
TESTS_testsuite_scripts = \
igt_command_line.sh \
$(NULL)
TESTS = \
$(TESTS_testsuite) \
$(TESTS_testsuite_scripts) \
$(NULL)
# Test that exercise specific asserts in the test framework library and are
# hence expected to fail.
XFAIL_TESTS = \