| Message ID | 1428501387-9043-1-git-send-email-thomas.wood@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On ke, 2015-04-08 at 14:56 +0100, Thomas Wood wrote: > Prefix the test scripts and data variables with dist_ to ensure they are > included in the distribution. > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Comment below. > Signed-off-by: Thomas Wood <thomas.wood@intel.com> > --- > tests/Makefile.am | 4 ++-- > tests/Makefile.sources | 6 ------ > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index 7fbf622..d6de373 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -32,13 +32,13 @@ igt_tests_bin_PROGRAMS += \ > $(TESTS_progs_M) \ > $(NULL) > > -igt_tests_bin_SCRIPTS += \ > +dist_igt_tests_bin_SCRIPTS = \ > $(TESTS_scripts) \ > $(TESTS_scripts_M) \ > $(scripts) \ > $(NULL) > > -igt_tests_data_DATA += \ > +dist_igt_tests_data_DATA = \ > $(IMAGES) \ > $(NULL) > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > index 3e3aa57..59a06e9 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -13,12 +13,6 @@ igt_tests_bin_PROGRAMS = \ > $(TESTS_progs_M) \ > $(NULL) > > -igt_tests_bin_SCRIPTS = \ > - $(NULL) > - > -igt_tests_data_DATA = \ > - $(NULL) > - I'd include the movement of the variables (and removal of +=) from the second patch to here and commit those parts already. I seem to have myself missed that the fact that both places were adding same variables to it. Regards, Joonas > NOUVEAU_TESTS_M = \ > prime_nv_api \ > prime_nv_pcopy \
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7fbf622..d6de373 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,13 +32,13 @@ igt_tests_bin_PROGRAMS += \ $(TESTS_progs_M) \ $(NULL) -igt_tests_bin_SCRIPTS += \ +dist_igt_tests_bin_SCRIPTS = \ $(TESTS_scripts) \ $(TESTS_scripts_M) \ $(scripts) \ $(NULL) -igt_tests_data_DATA += \ +dist_igt_tests_data_DATA = \ $(IMAGES) \ $(NULL) diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 3e3aa57..59a06e9 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -13,12 +13,6 @@ igt_tests_bin_PROGRAMS = \ $(TESTS_progs_M) \ $(NULL) -igt_tests_bin_SCRIPTS = \ - $(NULL) - -igt_tests_data_DATA = \ - $(NULL) - NOUVEAU_TESTS_M = \ prime_nv_api \ prime_nv_pcopy \
Prefix the test scripts and data variables with dist_ to ensure they are included in the distribution. Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Thomas Wood <thomas.wood@intel.com> --- tests/Makefile.am | 4 ++-- tests/Makefile.sources | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-)