On 10 December 2015 at 09:27, Morton, Derek J <[email protected]> wrote: >> >> >>-----Original Message----- >>From: Intel-gfx [mailto:[email protected]] On Behalf Of >>Daniel Vetter >>Sent: Thursday, December 10, 2015 9:07 AM >>To: Wood, Thomas >>Cc: [email protected] >>Subject: Re: [Intel-gfx] [PATCH i-g-t v2] tests: update .gitignore and add a >>Makefile rule to create it >> >>On Mon, Dec 07, 2015 at 03:12:15PM +0000, Thomas Wood wrote: >>> v2: generate the .gitignore file with the default target >>> >>> Signed-off-by: Thomas Wood <[email protected]> >> >>Hm, committing files that the build system updates is generally a bad idea. I >>think if we do this, we should remove the .gitignore here. Not sure how that >>will work in general. >> >>But since I screw this up every 2nd time I really like the idea. >>-Daniel > > This does not apply to the android build system so .gitignore would never be > generated during android builds. However the android build system does not > put the test binaries in the same place as the source code so perhaps it does > not matter.
I had kept the file in the repository because it wouldn't be generated by the Android build system. However, since it doesn't apply to Android builds, I'll remove .gitignore from the repository and then it will always be created by the automake build system. > > //Derek > >> >>> --- >>> tests/.gitignore | 13 +++++++------ >>> tests/Makefile.am | 4 ++++ >>> 2 files changed, 11 insertions(+), 6 deletions(-) >>> >>> diff --git a/tests/.gitignore b/tests/.gitignore index >>> 6377007..f127bfc 100644 >>> --- a/tests/.gitignore >>> +++ b/tests/.gitignore >>> @@ -1,7 +1,6 @@ >>> -# Please keep sorted alphabetically >>> core_auth >>> -core_get_client_auth >>> core_getclient >>> +core_get_client_auth >>> core_getstats >>> core_getversion >>> core_prop_blob >>> @@ -27,6 +26,7 @@ gem_close_race >>> gem_concurrent_all >>> gem_concurrent_blit >>> gem_cpu_reloc >>> +gem_create >>> gem_cs_prefetch >>> gem_cs_tlb >>> gem_ctx_bad_destroy >>> @@ -51,9 +51,9 @@ gem_exec_nop >>> gem_exec_params >>> gem_exec_parse >>> gem_fd_exhaustion >>> +gem_fenced_exec_thrash >>> gem_fence_thrash >>> gem_fence_upload >>> -gem_fenced_exec_thrash >>> gem_flink_basic >>> gem_flink_race >>> gem_gpgpu_fill >>> @@ -94,14 +94,16 @@ gem_render_linear_blits gem_render_tiled_blits >>> gem_request_retire gem_reset_stats >>> +gem_ringfill >>> gem_ring_sync_copy >>> gem_ring_sync_loop >>> -gem_ringfill >>> gem_seqno_wrap >>> gem_set_tiling_vs_blt >>> gem_set_tiling_vs_gtt >>> gem_set_tiling_vs_pwrite >>> +gem_stolen >>> gem_storedw_batches_loop >>> +gem_storedw_loop >>> gem_streaming_writes >>> gem_stress >>> gem_threaded_access_tiled >>> @@ -167,6 +169,5 @@ prime_nv_test >>> prime_self_import >>> prime_udl >>> template >>> -test-list.txt >>> testdisplay >>> -gem_storedw_loop >>> +test-list.txt >>> diff --git a/tests/Makefile.am b/tests/Makefile.am index >>> c4f1f01..2b25cd3 100644 >>> --- a/tests/Makefile.am >>> +++ b/tests/Makefile.am >>> @@ -32,6 +32,10 @@ dist_pkgdata_DATA = \ >>> $(IMAGES) \ >>> $(NULL) >>> >>> +all-local: .gitignore >>> +.gitignore: Makefile.sources >>> + @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt" | sed >>> +'s/\s\+/\n/g' | sort > $@ >>> + >>> pkgdata_DATA = test-list.txt >>> >>> EXTRA_PROGRAMS = $(HANG) >>> -- >>> 1.9.1 >>> >>> _______________________________________________ >>> Intel-gfx mailing list >>> [email protected] >>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >>-- >>Daniel Vetter >>Software Engineer, Intel Corporation >>http://blog.ffwll.ch >>_______________________________________________ >>Intel-gfx mailing list >>[email protected] >>http://lists.freedesktop.org/mailman/listinfo/intel-gfx >> _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
