Skip to contentSkip to conversation

tests/Makefile.sources: Remove unused XFAIL_TESTS

PATCH In review Petri Latvala 2 participants 4 messages Jun 8, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tests/Makefile.sources: Remove unused XFAIL_TESTS

The tests listed in XFAIL_TESTS have moved to lib/tests quite a while ago.

---
 tests/Makefile.sources | 8 --------
 1 file changed, 8 deletions(-)
tests/Makefile.sources +0 -8
index b3a680e..14ea5b6 100644
@@ -293,14 +293,6 @@ kernel_tests_full = \
 	$(extra_multi_kernel_tests) \
 	$(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)
-
 # IMPORTANT: These tests here are all disabled because the result in sometime
 # unrecoverable gpu hangs. Don't put real testcases here.
 HANG = \
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 tests: Merge single_kernel_tests and multi_kernel_tests in the build system

The separation of testcases with and without subtests in the build system was used in the past, but now both are handled the same way. Merge them together and finally forget about the difference between TESTS_progs and TESTS_progs_M.

---
 tests/Makefile.am      |  16 ++--
 tests/Makefile.sources | 238 +++++++++++++++++++++----------------------------
 2 files changed, 111 insertions(+), 143 deletions(-)
tests/Makefile.am +7 -9
index 12cc6dc..9a1c770 100644
@@ -1,19 +1,19 @@
 include Makefile.sources
 
 if HAVE_LIBDRM_AMDGPU
-    TESTS_progs_M += $(AMDGPU_TESTS_M)
+    TESTS_progs += $(AMDGPU_TESTS)
 endif
 
 if HAVE_LIBDRM_NOUVEAU
-    TESTS_progs_M += $(NOUVEAU_TESTS_M)
+    TESTS_progs += $(NOUVEAU_TESTS)
 endif
 
 if HAVE_LIBDRM_VC4
-    TESTS_progs_M += $(VC4_TESTS_M)
+    TESTS_progs += $(VC4_TESTS)
 endif
 
 if HAVE_CHAMELIUM
-TESTS_progs_M += \
+TESTS_progs += \
 	chamelium \
 	$(NULL)
 endif
@@ -21,12 +21,12 @@ endif
 if BUILD_TESTS
 test-list.txt: Makefile.sources
 	@echo TESTLIST > $@
-	@echo ${single_kernel_tests} ${multi_kernel_tests} >> $@
+	@echo ${kernel_tests} >> $@
 	@echo END TESTLIST >> $@
 
 test-list-full.txt: Makefile.sources
 	@echo TESTLIST > $@
-	@echo ${single_kernel_tests} ${multi_kernel_tests} ${extra_multi_kernel_tests} >> $@
+	@echo ${kernel_tests} ${extra_kernel_tests} >> $@
 	@echo END TESTLIST >> $@
 
 
@@ -38,13 +38,11 @@ noinst_PROGRAMS = \
 pkglibexec_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
-	$(TESTS_progs_M) \
-	$(TESTS_progs_XM) \
+	$(TESTS_progs_X) \
 	$(NULL)
 
 dist_pkglibexec_SCRIPTS = \
 	$(TESTS_scripts) \
-	$(TESTS_scripts_M) \
 	$(scripts) \
 	$(NULL)
 
tests/Makefile.sources +104 -134

393 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH i-g-t 2/2] tests: Merge single_kernel_tests and multi_kernel_tests in the build system

Quoted 6 lines · Petri Latvala

The separation of testcases with and without subtests in the build system was used in the past, but now both are handled the same way. Merge them together and finally forget about the difference between TESTS_progs and TESTS_progs_M.

Signature · 6 lines
Cheers,
Arek
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx