| Message ID | 1463487166-20570-1-git-send-email-marius.c.vlad@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 17, 2016 at 03:12:46PM +0300, Marius Vlad wrote: > An attempt to have piglit not taking too much time when listing tests, > but also keep tests/gem_concurrent_blit into list of tests. > > This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and > tried to be fixed c785a89ee (autotools/: Allow building > tests/gem_concurrent_{all, blit}) but without addressing the > comments of the reviewer. While at it, remove tests-lists-full.txt as it not > needed anymore. > > https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html > > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> Ack on both I think. Maybe ping Chris about this too, but I think he should be happy with gem_concurrent_blit back in the igt game. -Daniel > --- > tests/Makefile.am | 15 +++++---------- > tests/Makefile.sources | 17 ++--------------- > 2 files changed, 7 insertions(+), 25 deletions(-) > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index c2c2025..359d911 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -14,11 +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) \ > @@ -28,9 +23,9 @@ noinst_PROGRAMS = \ > pkglibexec_PROGRAMS = \ > gem_alive \ > gem_stress \ > + gem_concurrent_all \ > $(TESTS_progs) \ > $(TESTS_progs_M) \ > - $(TESTS_progs_XM) \ > $(NULL) > > dist_pkglibexec_SCRIPTS = \ > @@ -45,14 +40,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_PROGRAMS = $(HANG) gem_concurrent_all > 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 7b5f316..22dbaca 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -22,6 +22,7 @@ TESTS_progs_M = \ > gem_close_race \ > gem_create \ > gem_cs_tlb \ > + gem_concurrent_blit \ > gem_ctx_bad_exec \ > gem_ctx_exec \ > gem_ctx_param \ > @@ -118,11 +119,6 @@ TESTS_progs_M = \ > template \ > $(NULL) > > -TESTS_progs_XM = \ > - gem_concurrent_blit \ > - gem_concurrent_all \ > - $(NULL) > - > TESTS_progs = \ > core_auth \ > core_getclient \ > @@ -226,14 +222,6 @@ multi_kernel_tests = \ > $(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 > @@ -251,8 +239,7 @@ kernel_tests = \ > kernel_tests_full = \ > $(single_kernel_tests) \ > $(multi_kernel_tests) \ > - $(extra_multi_kernel_tests) \ > - $(NULL) > + $(NULL) > > # Test that exercise specific asserts in the test framework library and are > # hence expected to fail. > -- > 2.8.0.rc3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ping? On Tue, May 17, 2016 at 03:22:20PM +0200, Daniel Vetter wrote: > On Tue, May 17, 2016 at 03:12:46PM +0300, Marius Vlad wrote: > > An attempt to have piglit not taking too much time when listing tests, > > but also keep tests/gem_concurrent_blit into list of tests. > > > > This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and > > tried to be fixed c785a89ee (autotools/: Allow building > > tests/gem_concurrent_{all, blit}) but without addressing the > > comments of the reviewer. While at it, remove tests-lists-full.txt as it not > > needed anymore. > > > > https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html > > > > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> > > Ack on both I think. Maybe ping Chris about this too, but I think he > should be happy with gem_concurrent_blit back in the igt game. > -Daniel > > > --- > > tests/Makefile.am | 15 +++++---------- > > tests/Makefile.sources | 17 ++--------------- > > 2 files changed, 7 insertions(+), 25 deletions(-) > > > > diff --git a/tests/Makefile.am b/tests/Makefile.am > > index c2c2025..359d911 100644 > > --- a/tests/Makefile.am > > +++ b/tests/Makefile.am > > @@ -14,11 +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) \ > > @@ -28,9 +23,9 @@ noinst_PROGRAMS = \ > > pkglibexec_PROGRAMS = \ > > gem_alive \ > > gem_stress \ > > + gem_concurrent_all \ > > $(TESTS_progs) \ > > $(TESTS_progs_M) \ > > - $(TESTS_progs_XM) \ > > $(NULL) > > > > dist_pkglibexec_SCRIPTS = \ > > @@ -45,14 +40,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_PROGRAMS = $(HANG) gem_concurrent_all > > 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 7b5f316..22dbaca 100644 > > --- a/tests/Makefile.sources > > +++ b/tests/Makefile.sources > > @@ -22,6 +22,7 @@ TESTS_progs_M = \ > > gem_close_race \ > > gem_create \ > > gem_cs_tlb \ > > + gem_concurrent_blit \ > > gem_ctx_bad_exec \ > > gem_ctx_exec \ > > gem_ctx_param \ > > @@ -118,11 +119,6 @@ TESTS_progs_M = \ > > template \ > > $(NULL) > > > > -TESTS_progs_XM = \ > > - gem_concurrent_blit \ > > - gem_concurrent_all \ > > - $(NULL) > > - > > TESTS_progs = \ > > core_auth \ > > core_getclient \ > > @@ -226,14 +222,6 @@ multi_kernel_tests = \ > > $(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 > > @@ -251,8 +239,7 @@ kernel_tests = \ > > kernel_tests_full = \ > > $(single_kernel_tests) \ > > $(multi_kernel_tests) \ > > - $(extra_multi_kernel_tests) \ > > - $(NULL) > > + $(NULL) > > > > # Test that exercise specific asserts in the test framework library and are > > # hence expected to fail. > > -- > > 2.8.0.rc3 > > > > _______________________________________________ > > 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
On 17.05.2016 15:12, Marius Vlad wrote: > An attempt to have piglit not taking too much time when listing tests, > but also keep tests/gem_concurrent_blit into list of tests. > > This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and > tried to be fixed c785a89ee (autotools/: Allow building > tests/gem_concurrent_{all, blit}) but without addressing the > comments of the reviewer. While at it, remove tests-lists-full.txt as it not > needed anymore. This will remove the option to run gem_concurrent_all with piglit, unless manually added in test-list.txt. Is this what we (or QA) want? Gabriel. > > https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html > > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> > --- > tests/Makefile.am | 15 +++++---------- > tests/Makefile.sources | 17 ++--------------- > 2 files changed, 7 insertions(+), 25 deletions(-) > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index c2c2025..359d911 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -14,11 +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) \ > @@ -28,9 +23,9 @@ noinst_PROGRAMS = \ > pkglibexec_PROGRAMS = \ > gem_alive \ > gem_stress \ > + gem_concurrent_all \ > $(TESTS_progs) \ > $(TESTS_progs_M) \ > - $(TESTS_progs_XM) \ > $(NULL) > > dist_pkglibexec_SCRIPTS = \ > @@ -45,14 +40,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_PROGRAMS = $(HANG) gem_concurrent_all > 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 7b5f316..22dbaca 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -22,6 +22,7 @@ TESTS_progs_M = \ > gem_close_race \ > gem_create \ > gem_cs_tlb \ > + gem_concurrent_blit \ > gem_ctx_bad_exec \ > gem_ctx_exec \ > gem_ctx_param \ > @@ -118,11 +119,6 @@ TESTS_progs_M = \ > template \ > $(NULL) > > -TESTS_progs_XM = \ > - gem_concurrent_blit \ > - gem_concurrent_all \ > - $(NULL) > - > TESTS_progs = \ > core_auth \ > core_getclient \ > @@ -226,14 +222,6 @@ multi_kernel_tests = \ > $(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 > @@ -251,8 +239,7 @@ kernel_tests = \ > kernel_tests_full = \ > $(single_kernel_tests) \ > $(multi_kernel_tests) \ > - $(extra_multi_kernel_tests) \ > - $(NULL) > + $(NULL) > > # Test that exercise specific asserts in the test framework library and are > # hence expected to fail. >
On Wed, May 18, 2016 at 12:37:31PM +0300, Gabriel Feceoru wrote: > > > On 17.05.2016 15:12, Marius Vlad wrote: > >An attempt to have piglit not taking too much time when listing tests, > >but also keep tests/gem_concurrent_blit into list of tests. > > > >This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and > >tried to be fixed c785a89ee (autotools/: Allow building > >tests/gem_concurrent_{all, blit}) but without addressing the > >comments of the reviewer. While at it, remove tests-lists-full.txt as it not > >needed anymore. > > This will remove the option to run gem_concurrent_all with piglit, unless > manually added in test-list.txt. > > Is this what we (or QA) want? How is this different than creating another list 'test' file and add gem_concurrent_all in it? run-scripts.sh doesn't seem to have an option to pass another file as list of tests. > > Gabriel. > > > > >https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html > > > >Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> > >--- > > tests/Makefile.am | 15 +++++---------- > > tests/Makefile.sources | 17 ++--------------- > > 2 files changed, 7 insertions(+), 25 deletions(-) > > > >diff --git a/tests/Makefile.am b/tests/Makefile.am > >index c2c2025..359d911 100644 > >--- a/tests/Makefile.am > >+++ b/tests/Makefile.am > >@@ -14,11 +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) \ > >@@ -28,9 +23,9 @@ noinst_PROGRAMS = \ > > pkglibexec_PROGRAMS = \ > > gem_alive \ > > gem_stress \ > >+ gem_concurrent_all \ > > $(TESTS_progs) \ > > $(TESTS_progs_M) \ > >- $(TESTS_progs_XM) \ > > $(NULL) > > > > dist_pkglibexec_SCRIPTS = \ > >@@ -45,14 +40,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_PROGRAMS = $(HANG) gem_concurrent_all > > 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 7b5f316..22dbaca 100644 > >--- a/tests/Makefile.sources > >+++ b/tests/Makefile.sources > >@@ -22,6 +22,7 @@ TESTS_progs_M = \ > > gem_close_race \ > > gem_create \ > > gem_cs_tlb \ > >+ gem_concurrent_blit \ > > gem_ctx_bad_exec \ > > gem_ctx_exec \ > > gem_ctx_param \ > >@@ -118,11 +119,6 @@ TESTS_progs_M = \ > > template \ > > $(NULL) > > > >-TESTS_progs_XM = \ > >- gem_concurrent_blit \ > >- gem_concurrent_all \ > >- $(NULL) > >- > > TESTS_progs = \ > > core_auth \ > > core_getclient \ > >@@ -226,14 +222,6 @@ multi_kernel_tests = \ > > $(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 > >@@ -251,8 +239,7 @@ kernel_tests = \ > > kernel_tests_full = \ > > $(single_kernel_tests) \ > > $(multi_kernel_tests) \ > >- $(extra_multi_kernel_tests) \ > >- $(NULL) > >+ $(NULL) > > > > # Test that exercise specific asserts in the test framework library and are > > # hence expected to fail. > >
diff --git a/tests/Makefile.am b/tests/Makefile.am index c2c2025..359d911 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,11 +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) \ @@ -28,9 +23,9 @@ noinst_PROGRAMS = \ pkglibexec_PROGRAMS = \ gem_alive \ gem_stress \ + gem_concurrent_all \ $(TESTS_progs) \ $(TESTS_progs_M) \ - $(TESTS_progs_XM) \ $(NULL) dist_pkglibexec_SCRIPTS = \ @@ -45,14 +40,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_PROGRAMS = $(HANG) gem_concurrent_all 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 7b5f316..22dbaca 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -22,6 +22,7 @@ TESTS_progs_M = \ gem_close_race \ gem_create \ gem_cs_tlb \ + gem_concurrent_blit \ gem_ctx_bad_exec \ gem_ctx_exec \ gem_ctx_param \ @@ -118,11 +119,6 @@ TESTS_progs_M = \ template \ $(NULL) -TESTS_progs_XM = \ - gem_concurrent_blit \ - gem_concurrent_all \ - $(NULL) - TESTS_progs = \ core_auth \ core_getclient \ @@ -226,14 +222,6 @@ multi_kernel_tests = \ $(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 @@ -251,8 +239,7 @@ kernel_tests = \ kernel_tests_full = \ $(single_kernel_tests) \ $(multi_kernel_tests) \ - $(extra_multi_kernel_tests) \ - $(NULL) + $(NULL) # Test that exercise specific asserts in the test framework library and are # hence expected to fail.
An attempt to have piglit not taking too much time when listing tests, but also keep tests/gem_concurrent_blit into list of tests. This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and tried to be fixed c785a89ee (autotools/: Allow building tests/gem_concurrent_{all, blit}) but without addressing the comments of the reviewer. While at it, remove tests-lists-full.txt as it not needed anymore. https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> --- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)