tests: Moved gem_concurrent_blit back to the normal set
PATCH 1/1 tests: Moved gem_concurrent_blit back to the normal set
Repairing the damage I caused not reading properly Daniel's comment in:
https://patchwork.freedesktop.org/patch/81600/
Leaving gem_concurrent_all only in the EXTRA set
--- tests/Makefile.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.sources +1 -1
@@ -20,6 +20,7 @@ TESTS_progs_M = \ gem_busy \ gem_caching \ gem_close_race \ + gem_concurrent_blit \ gem_create \ gem_cs_tlb \ gem_ctx_bad_exec \
@@ -119,7 +120,6 @@ TESTS_progs_M = \ $(NULL) TESTS_progs_XM = \ - gem_concurrent_blit \ gem_concurrent_all \ $(NULL)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS.
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
--- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)
tests/Makefile.am +5 -10
@@ -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)/.. \
tests/Makefile.sources +2 -15
@@ -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.
Signature · 6 lines
2.8.0.rc3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS.
Quoted 9 lines · Marius Vlad
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 fixedc785a89ee(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.
Quoted 3 lines
https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html
Signed-off-by Marius Vlad <[email protected]>
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
Quoted 107 lines
--- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)tests/Makefile.am +5
-10@@ -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)/.. \tests/Makefile.sources +2
-15@@ -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.Signature · 6 lines
2.8.0.rc3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS.
Ping?
Quoted 121 lines · Daniel Vetter
Quoted 9 lines · Marius Vlad
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 fixedc785a89ee(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.Quoted 3 lines
https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html
Signed-off-by Marius Vlad <[email protected]>Ack on both I think. Maybe ping Chris about this too, but I think he should be happy with
gem_concurrent_blitback in the igt game. -DanielQuoted 103 lines
--- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)tests/Makefile.am +5
-10@@ -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)/.. \tests/Makefile.sources +2
-15@@ -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.Signature · 1 line
2.8.0.rc3
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS.
In reply to Marius VladQuoted 8 lines · Marius Vlad
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 fixedc785a89ee(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.
Quoted 96 lines
https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html
Signed-off-by Marius Vlad <[email protected]>--- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)tests/Makefile.am +5
-10@@ -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)/.. \tests/Makefile.sources +1
-13@@ -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
tests/Makefile.sources kernel_tests = \ · line 245
Quoted 9 lines
tests/Makefile.sources +1
-2@@ -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.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS.
Quoted 12 lines · Gabriel Feceoru
Quoted 8 lines · Marius Vlad
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 fixedc785a89ee(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.
Quoted 4 lines
This will remove the option to run
gem_concurrent_allwith 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.
Quoted 105 lines
Gabriel.
Quoted 102 lines
https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html
Signed-off-by Marius Vlad <[email protected]>--- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-)tests/Makefile.am +5
-10@@ -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)/.. \tests/Makefile.sources +2
-15@@ -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)
Quoted 3 lines
tests/Makefile.sources kernel_tests = \ · line 245
Quoted 3 lines
tests/Makefile.sources +0
-0# Test that exercise specific asserts in the test framework library and are # hence expected to fail.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Marius Vlad
AppliedApplied.
Quoted 35 lines · Gabriel Feceoru
Repairing the damage I caused not reading properly Daniel's comment in:
https://patchwork.freedesktop.org/patch/81600/Leaving
gem_concurrent_allonly in the EXTRA setCc Daniel Vetter <[email protected]>Cc Marius Vlad <[email protected]>Signed-off-by Gabriel Feceoru <[email protected]>--- tests/Makefile.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/Makefile.sources +1
-1@@ -20,6 +20,7 @@ TESTS_progs_M = \ gem_busy \ gem_caching \ gem_close_race \ + gem_concurrent_blit \ gem_create \ gem_cs_tlb \ gem_ctx_bad_exec \@@ -119,7 +120,6 @@ TESTS_progs_M = \ $(NULL) TESTS_progs_XM = \ - gem_concurrent_blit \ gem_concurrent_all \ $(NULL)Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx