From: Marius Vlad Subject: Re: [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS. Date: Tue, 17 May 2016 17:08:49 +0300 Message-ID: <20160517140849.GA3521@mcvlad-wk.rb.intel.com> References: <1463486747-20550-1-git-send-email-gabriel.feceoru@intel.com> <1463487166-20570-1-git-send-email-marius.c.vlad@intel.com> <20160517132220.GN27098@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0558200248==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 66FC16E697 for ; Tue, 17 May 2016 14:05:52 +0000 (UTC) In-Reply-To: <20160517132220.GN27098@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: daniel.vetter@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0558200248== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. > >=20 > > This was added in a633ad03c6 (tests: Separate tests with lots of subtes= ts) 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 i= t not > > needed anymore. > >=20 > > https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html > >=20 > > Signed-off-by: Marius Vlad >=20 > 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 >=20 > > --- > > tests/Makefile.am | 15 +++++---------- > > tests/Makefile.sources | 17 ++--------------- > > 2 files changed, 7 insertions(+), 25 deletions(-) > >=20 > > 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 >> $@ > > =20 > > -test-list-full.txt: Makefile.sources > > - @echo TESTLIST > $@ > > - @echo ${single_kernel_tests} ${multi_kernel_tests} ${extra_multi_kern= el_tests} >> $@ > > - @echo END TESTLIST >> $@ > > - > > =20 > > noinst_PROGRAMS =3D \ > > $(HANG) \ > > @@ -28,9 +23,9 @@ noinst_PROGRAMS =3D \ > > pkglibexec_PROGRAMS =3D \ > > gem_alive \ > > gem_stress \ > > + gem_concurrent_all \ > > $(TESTS_progs) \ > > $(TESTS_progs_M) \ > > - $(TESTS_progs_XM) \ > > $(NULL) > > =20 > > dist_pkglibexec_SCRIPTS =3D \ > > @@ -45,14 +40,14 @@ dist_pkgdata_DATA =3D \ > > =20 > > all-local: .gitignore > > .gitignore: Makefile.sources > > - @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.tx= t .gitignore" | sed 's/\s\+/\n/g' | sort > $@ > > + @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt .gitignore" | sed= 's/\s\+/\n/g' | sort > $@ > > =20 > > -pkgdata_DATA =3D test-list.txt test-list-full.txt > > +pkgdata_DATA =3D test-list.txt > > =20 > > -EXTRA_PROGRAMS =3D $(HANG) > > +EXTRA_PROGRAMS =3D $(HANG) gem_concurrent_all > > EXTRA_DIST =3D $(common_files) > > =20 > > -CLEANFILES =3D $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .git= ignore > > +CLEANFILES =3D $(EXTRA_PROGRAMS) test-list.txt .gitignore > > =20 > > AM_CFLAGS =3D $(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 =3D \ > > 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 =3D \ > > template \ > > $(NULL) > > =20 > > -TESTS_progs_XM =3D \ > > - gem_concurrent_blit \ > > - gem_concurrent_all \ > > - $(NULL) > > - > > TESTS_progs =3D \ > > core_auth \ > > core_getclient \ > > @@ -226,14 +222,6 @@ multi_kernel_tests =3D \ > > $(NULL) > > =20 > > =20 > > -# This target contains testcases with lots of subtests. > > -# It was split from multi_kernel_tests because of the overhead of list= ing all > > -# the subtests in piglit > > -extra_multi_kernel_tests =3D \ > > - $(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 o= ther magic > > @@ -251,8 +239,7 @@ kernel_tests =3D \ > > kernel_tests_full =3D \ > > $(single_kernel_tests) \ > > $(multi_kernel_tests) \ > > - $(extra_multi_kernel_tests) \ > > - $(NULL) > > + $(NULL) > > =20 > > # Test that exercise specific asserts in the test framework library an= d are > > # hence expected to fail. > > --=20 > > 2.8.0.rc3 > >=20 > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >=20 > --=20 > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch --XsQoSWH+UP9D9v3l Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJXOyXxAAoJELmLWIAQzyE+bXYH+wcIfQbC4Jny5LCK3aOYXyWa C01zZ7b9yfpfJlaAyyWWAcYoCT4vKpT/svVSQEsdzE9XDTsq9CBCyTNHklvlcJ7Z 1PaL0JXynz4yzC+tfLCZ+KEDrH43zQWTbm0vzwUAZv5S2sF33KlRNkwd0MKS2p6o 9zSNKjT31rsfa6SoTvATVIH+tOpVYyHPXAydmDPS7/89WeoqhT+Q+7uIJLq/zBpT EvwJg1Y0YvNa1G77448X5g1NUYDtTaFK5yYQRJJyjw1elsCpO+CuEBhOyq4F3tLr 9SDJDgFmHu1XGo5CggnlkMUO0HiMLPWRQy3QBQXSYRAa8+WO/BLtHfnRsnQK8/A= =VFAQ -----END PGP SIGNATURE----- --XsQoSWH+UP9D9v3l-- --===============0558200248== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0558200248==--