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

[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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Marius Vlad]

Introduced by 633ad03c6 (tests: Separate tests with lots of subtests).

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32b9115..c2c2025 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
 	$(TESTS_progs_M) \
+	$(TESTS_progs_XM) \
 	$(NULL)
 
 dist_pkglibexec_SCRIPTS = \
-- 
2.8.0.rc3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Jani Nikula]

On Sat, 14 May 2016, Marius Vlad <marius.c.vlad@intel.com> wrote:
> Introduced by 633ad03c6 (tests: Separate tests with lots of subtests).

fatal: ambiguous argument '633ad03c6': unknown revision or path not in the working tree.


>
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>  tests/Makefile.am | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 32b9115..c2c2025 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
>  	gem_stress \
>  	$(TESTS_progs) \
>  	$(TESTS_progs_M) \
> +	$(TESTS_progs_XM) \
>  	$(NULL)
>  
>  dist_pkglibexec_SCRIPTS = \

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v2] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Marius Vlad]

Introduced by a633ad03c6 (tests: Separate tests with lots of subtests).

v2: Fix commit typo (Jani Nikula).

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32b9115..c2c2025 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
 	$(TESTS_progs_M) \
+	$(TESTS_progs_XM) \
 	$(NULL)
 
 dist_pkglibexec_SCRIPTS = \
-- 
2.8.0.rc3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 854 bytes --]

Trivial. Pushed.

On Mon, May 16, 2016 at 01:36:48PM +0300, Marius Vlad wrote:
> Introduced by a633ad03c6 (tests: Separate tests with lots of subtests).
> 
> v2: Fix commit typo (Jani Nikula).
> 
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>  tests/Makefile.am | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 32b9115..c2c2025 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
>  	gem_stress \
>  	$(TESTS_progs) \
>  	$(TESTS_progs_M) \
> +	$(TESTS_progs_XM) \
>  	$(NULL)
>  
>  dist_pkglibexec_SCRIPTS = \
> -- 
> 2.8.0.rc3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Daniel Vetter]

On Mon, May 16, 2016 at 06:09:27PM +0300, Marius Vlad wrote:
> Trivial. Pushed.
> 
> On Mon, May 16, 2016 at 01:36:48PM +0300, Marius Vlad wrote:
> > Introduced by a633ad03c6 (tests: Separate tests with lots of subtests).
> > 
> > v2: Fix commit typo (Jani Nikula).
> > 
> > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>

Also review from my side on the offending original commit was ignored -
imo gem_concurrent_all should just be put into EXTRA, and
gem_concurrent_blit should be kept in the normal igt set of testcases.

Dropping gem_concurrent_blit from the list of tests means we have a
massive gap in coverage. If that one still has too many subtests we need
to filter them harder, but that's a different problem.

Also pls run $ make distcheck before pushing stuf ...
-Daniel

> > ---
> >  tests/Makefile.am | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tests/Makefile.am b/tests/Makefile.am
> > index 32b9115..c2c2025 100644
> > --- a/tests/Makefile.am
> > +++ b/tests/Makefile.am
> > @@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
> >  	gem_stress \
> >  	$(TESTS_progs) \
> >  	$(TESTS_progs_M) \
> > +	$(TESTS_progs_XM) \
> >  	$(NULL)
> >  
> >  dist_pkglibexec_SCRIPTS = \
> > -- 
> > 2.8.0.rc3
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx



> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v2] autotools/: Allow building tests/gem_concurrent_{all, blit}

[Gabriel Feceoru]

On 17.05.2016 13:02, Daniel Vetter wrote:
> On Mon, May 16, 2016 at 06:09:27PM +0300, Marius Vlad wrote:
>> Trivial. Pushed.
>>
>> On Mon, May 16, 2016 at 01:36:48PM +0300, Marius Vlad wrote:
>>> Introduced by a633ad03c6 (tests: Separate tests with lots of subtests).
>>>
>>> v2: Fix commit typo (Jani Nikula).
>>>
>>> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
>
> Also review from my side on the offending original commit was ignored -
> imo gem_concurrent_all should just be put into EXTRA, and
> gem_concurrent_blit should be kept in the normal igt set of testcases.
>
> Dropping gem_concurrent_blit from the list of tests means we have a
> massive gap in coverage. If that one still has too many subtests we need
> to filter them harder, but that's a different problem.

gem_concurrent_all can still be tested, using test-list-full.txt instead.
Now, piglit igt profile has hardcoded "test-list.txt" (plus 
"single-tests.txt" and "multi-tests.txt" - which I guess are history).
We can specify which test list to use with a change in piglit (by 
redefining IGT_TEST_ROOT or another var).
Alternatively test-list.txt can be replaced with test-list-full.txt (or 
symlink).

Regards,
Gabriel.

>
> Also pls run $ make distcheck before pushing stuf ...
> -Daniel
>
>>> ---
>>>   tests/Makefile.am | 1 +
>>>   1 file changed, 1 insertion(+)
>>>
>>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>>> index 32b9115..c2c2025 100644
>>> --- a/tests/Makefile.am
>>> +++ b/tests/Makefile.am
>>> @@ -30,6 +30,7 @@ pkglibexec_PROGRAMS = \
>>>   	gem_stress \
>>>   	$(TESTS_progs) \
>>>   	$(TESTS_progs_M) \
>>> +	$(TESTS_progs_XM) \
>>>   	$(NULL)
>>>
>>>   dist_pkglibexec_SCRIPTS = \
>>> --
>>> 2.8.0.rc3
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx