[Intel-gfx] [PATCH igt] Revert "tests: Separate tests with lots of subtests"

[Chris Wilson]

This reverts commit a633ad03c6a0e96eecfd4933ea0dffb68ed40e07 as it
completely breaks building the gem_concurrent_blit tests.
---
 tests/Makefile.am      | 12 +++---------
 tests/Makefile.sources | 22 ++--------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7bbec84..f3ae369 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,12 +14,6 @@ test-list.txt: Makefile.sources
 	@echo ${single_kernel_tests} ${multi_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 END TESTLIST >> $@
-
-
 noinst_PROGRAMS = \
 	$(HANG) \
 	$(TESTS_testsuite) \
@@ -44,14 +38,14 @@ dist_pkgdata_DATA = \
 
 all-local: .gitignore
 .gitignore: Makefile.sources
-	@echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@
+	@echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@
 
-pkgdata_DATA = test-list.txt test-list-full.txt
+pkgdata_DATA = test-list.txt
 
 EXTRA_PROGRAMS = $(HANG)
 EXTRA_DIST = $(common_files)
 
-CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
+CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt .gitignore
 
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
 	-I$(srcdir)/.. \
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index ad54317..50c5b14 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -20,6 +20,8 @@ TESTS_progs_M = \
 	gem_busy \
 	gem_caching \
 	gem_close_race \
+	gem_concurrent_blit \
+	gem_concurrent_all \
 	gem_create \
 	gem_cs_tlb \
 	gem_ctx_bad_exec \
@@ -119,11 +121,6 @@ TESTS_progs_M = \
 	template \
 	$(NULL)
 
-TESTS_progs_XM = \
-    gem_concurrent_blit \
-    gem_concurrent_all \
-    $(NULL)
-
 TESTS_progs = \
 	core_auth \
 	core_getclient \
@@ -226,15 +223,6 @@ multi_kernel_tests = \
 	$(TESTS_scripts_M) \
 	$(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.
 #
 # Your testcase should probably use igt_simple_main, but none of the other magic
@@ -249,12 +237,6 @@ kernel_tests = \
 	$(multi_kernel_tests) \
 	$(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
 # hence expected to fail.
 XFAIL_TESTS = \
-- 
2.8.1