* [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution
@ 2015-04-08 13:56 Thomas Wood
2015-04-08 13:56 ` [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data Thomas Wood
2015-04-09 6:50 ` [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Joonas Lahtinen
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Wood @ 2015-04-08 13:56 UTC (permalink / raw)
To: intel-gfx
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(-)
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 \
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data
2015-04-08 13:56 [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Thomas Wood
@ 2015-04-08 13:56 ` Thomas Wood
2015-04-09 6:45 ` Joonas Lahtinen
2015-04-09 6:50 ` [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Joonas Lahtinen
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Wood @ 2015-04-08 13:56 UTC (permalink / raw)
To: intel-gfx
Use the pkglibexec and pkgdata prefixes rather than setting bindir and
datadir. This also removes the extra 'tests' directory from within the
package libexec and data directories.
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
tests/Makefile.am | 15 +++++++++++----
tests/Makefile.sources | 15 ---------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6de373..dc864f4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources
@echo ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
-igt_tests_bin_PROGRAMS += \
+noinst_PROGRAMS = \
+ $(HANG) \
+ $(TESTS_testsuite) \
+ $(NULL)
+
+pkglibexec_PROGRAMS = \
+ gem_alive \
+ gem_stress \
$(TESTS_progs) \
$(TESTS_progs_M) \
$(NULL)
-dist_igt_tests_bin_SCRIPTS = \
+dist_pkglibexec_SCRIPTS = \
$(TESTS_scripts) \
$(TESTS_scripts_M) \
$(scripts) \
$(NULL)
-dist_igt_tests_data_DATA = \
+dist_pkgdata_DATA = \
$(IMAGES) \
$(NULL)
@@ -52,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
-I$(srcdir)/../lib \
-include "$(srcdir)/../lib/check-ndebug.h" \
-DIGT_SRCDIR=\""$(abs_srcdir)"\" \
- -DIGT_DATADIR=\""$(igt_tests_datadir)"\" \
+ -DIGT_DATADIR=\""$(pkgdatadir)"\" \
$(LIBUNWIND_CFLAGS) \
$(NULL)
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 59a06e9..4bf11bf 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -1,18 +1,3 @@
-igt_tests_bindir = $(pkglibexecdir)/tests
-igt_tests_datadir = $(pkgdatadir)/tests
-
-noinst_PROGRAMS = \
- $(HANG) \
- $(TESTS_testsuite) \
- $(NULL)
-
-igt_tests_bin_PROGRAMS = \
- gem_alive \
- gem_stress \
- $(TESTS_progs) \
- $(TESTS_progs_M) \
- $(NULL)
-
NOUVEAU_TESTS_M = \
prime_nv_api \
prime_nv_pcopy \
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data
2015-04-08 13:56 ` [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data Thomas Wood
@ 2015-04-09 6:45 ` Joonas Lahtinen
2015-04-09 12:21 ` Daniel Vetter
2015-04-09 15:56 ` Thomas Wood
0 siblings, 2 replies; 6+ messages in thread
From: Joonas Lahtinen @ 2015-04-09 6:45 UTC (permalink / raw)
To: Thomas Wood; +Cc: intel-gfx
On ke, 2015-04-08 at 14:56 +0100, Thomas Wood wrote:
> Use the pkglibexec and pkgdata prefixes rather than setting bindir and
> datadir. This also removes the extra 'tests' directory from within the
> package libexec and data directories.
>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
> ---
> tests/Makefile.am | 15 +++++++++++----
> tests/Makefile.sources | 15 ---------------
> 2 files changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index d6de373..dc864f4 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources
> @echo ${multi_kernel_tests} >> $@
> @echo END TESTLIST >> $@
>
> -igt_tests_bin_PROGRAMS += \
> +noinst_PROGRAMS = \
> + $(HANG) \
> + $(TESTS_testsuite) \
> + $(NULL)
> +
> +pkglibexec_PROGRAMS = \
> + gem_alive \
> + gem_stress \
> $(TESTS_progs) \
> $(TESTS_progs_M) \
> $(NULL)
Reasoning for the tests directory was that if the tests just sit under
pkglibexec, they might be mistaken for tools (as the i-g-t package name
suggests) by packagers or really anybody.
If it's so important not to have the tests directory, I'd rather suffix
all the programs with "_test" during build. It would cause some
cascading changes too, so why do you want to get rid of the tests
directory in the first place?
>
> -dist_igt_tests_bin_SCRIPTS = \
> +dist_pkglibexec_SCRIPTS = \
> $(TESTS_scripts) \
> $(TESTS_scripts_M) \
> $(scripts) \
> $(NULL)
>
This one was giving me complaints with automake 1.14.1 that SCRIPTS
don't belong straight to pkglibexec, so this would have to be kept
indirect like it is, be it with tests directory or not.
> -dist_igt_tests_data_DATA = \
> +dist_pkgdata_DATA = \
> $(IMAGES) \
> $(NULL)
>
> @@ -52,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
> -I$(srcdir)/../lib \
> -include "$(srcdir)/../lib/check-ndebug.h" \
> -DIGT_SRCDIR=\""$(abs_srcdir)"\" \
> - -DIGT_DATADIR=\""$(igt_tests_datadir)"\" \
> + -DIGT_DATADIR=\""$(pkgdatadir)"\" \
> $(LIBUNWIND_CFLAGS) \
> $(NULL)
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 59a06e9..4bf11bf 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -1,18 +1,3 @@
> -igt_tests_bindir = $(pkglibexecdir)/tests
> -igt_tests_datadir = $(pkgdatadir)/tests
> -
> -noinst_PROGRAMS = \
> - $(HANG) \
> - $(TESTS_testsuite) \
> - $(NULL)
> -
> -igt_tests_bin_PROGRAMS = \
> - gem_alive \
> - gem_stress \
> - $(TESTS_progs) \
> - $(TESTS_progs_M) \
> - $(NULL)
> -
> NOUVEAU_TESTS_M = \
> prime_nv_api \
> prime_nv_pcopy \
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution
2015-04-08 13:56 [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Thomas Wood
2015-04-08 13:56 ` [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data Thomas Wood
@ 2015-04-09 6:50 ` Joonas Lahtinen
1 sibling, 0 replies; 6+ messages in thread
From: Joonas Lahtinen @ 2015-04-09 6:50 UTC (permalink / raw)
To: Thomas Wood; +Cc: intel-gfx
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 \
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data
2015-04-09 6:45 ` Joonas Lahtinen
@ 2015-04-09 12:21 ` Daniel Vetter
2015-04-09 15:56 ` Thomas Wood
1 sibling, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2015-04-09 12:21 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: intel-gfx, Thomas Wood
On Thu, Apr 09, 2015 at 09:45:13AM +0300, Joonas Lahtinen wrote:
> On ke, 2015-04-08 at 14:56 +0100, Thomas Wood wrote:
> > Use the pkglibexec and pkgdata prefixes rather than setting bindir and
> > datadir. This also removes the extra 'tests' directory from within the
> > package libexec and data directories.
> >
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Signed-off-by: Thomas Wood <thomas.wood@intel.com>
> > ---
> > tests/Makefile.am | 15 +++++++++++----
> > tests/Makefile.sources | 15 ---------------
> > 2 files changed, 11 insertions(+), 19 deletions(-)
> >
> > diff --git a/tests/Makefile.am b/tests/Makefile.am
> > index d6de373..dc864f4 100644
> > --- a/tests/Makefile.am
> > +++ b/tests/Makefile.am
> > @@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources
> > @echo ${multi_kernel_tests} >> $@
> > @echo END TESTLIST >> $@
> >
> > -igt_tests_bin_PROGRAMS += \
> > +noinst_PROGRAMS = \
> > + $(HANG) \
> > + $(TESTS_testsuite) \
> > + $(NULL)
> > +
> > +pkglibexec_PROGRAMS = \
> > + gem_alive \
> > + gem_stress \
> > $(TESTS_progs) \
> > $(TESTS_progs_M) \
> > $(NULL)
>
> Reasoning for the tests directory was that if the tests just sit under
> pkglibexec, they might be mistaken for tools (as the i-g-t package name
> suggests) by packagers or really anybody.
>
> If it's so important not to have the tests directory, I'd rather suffix
> all the programs with "_test" during build. It would cause some
> cascading changes too, so why do you want to get rid of the tests
> directory in the first place?
Imo libexec is a sufficient hint that this is internal stuff that we don't
need to add a prefix or subdir.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data
2015-04-09 6:45 ` Joonas Lahtinen
2015-04-09 12:21 ` Daniel Vetter
@ 2015-04-09 15:56 ` Thomas Wood
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Wood @ 2015-04-09 15:56 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: Intel Graphics Development
On 9 April 2015 at 07:45, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
> On ke, 2015-04-08 at 14:56 +0100, Thomas Wood wrote:
>> Use the pkglibexec and pkgdata prefixes rather than setting bindir and
>> datadir. This also removes the extra 'tests' directory from within the
>> package libexec and data directories.
>>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
>> ---
>> tests/Makefile.am | 15 +++++++++++----
>> tests/Makefile.sources | 15 ---------------
>> 2 files changed, 11 insertions(+), 19 deletions(-)
>>
>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>> index d6de373..dc864f4 100644
>> --- a/tests/Makefile.am
>> +++ b/tests/Makefile.am
>> @@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources
>> @echo ${multi_kernel_tests} >> $@
>> @echo END TESTLIST >> $@
>>
>> -igt_tests_bin_PROGRAMS += \
>> +noinst_PROGRAMS = \
>> + $(HANG) \
>> + $(TESTS_testsuite) \
>> + $(NULL)
>> +
>> +pkglibexec_PROGRAMS = \
>> + gem_alive \
>> + gem_stress \
>> $(TESTS_progs) \
>> $(TESTS_progs_M) \
>> $(NULL)
>
> Reasoning for the tests directory was that if the tests just sit under
> pkglibexec, they might be mistaken for tools (as the i-g-t package name
> suggests) by packagers or really anybody.
I think pklibexec is sufficient since user tools ought to be install
in bin anyway. The test list should also be installed in pkgdatadir to
identify the test binaries.
>
> If it's so important not to have the tests directory, I'd rather suffix
> all the programs with "_test" during build. It would cause some
> cascading changes too, so why do you want to get rid of the tests
> directory in the first place?
>
>>
>> -dist_igt_tests_bin_SCRIPTS = \
>> +dist_pkglibexec_SCRIPTS = \
>> $(TESTS_scripts) \
>> $(TESTS_scripts_M) \
>> $(scripts) \
>> $(NULL)
>>
>
> This one was giving me complaints with automake 1.14.1 that SCRIPTS
> don't belong straight to pkglibexec, so this would have to be kept
> indirect like it is, be it with tests directory or not.
I also have automake 1.14.1 and it doesn't seem to complain. Does it
prevent automake from completing successfully?
>
>> -dist_igt_tests_data_DATA = \
>> +dist_pkgdata_DATA = \
>> $(IMAGES) \
>> $(NULL)
>>
>> @@ -52,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
>> -I$(srcdir)/../lib \
>> -include "$(srcdir)/../lib/check-ndebug.h" \
>> -DIGT_SRCDIR=\""$(abs_srcdir)"\" \
>> - -DIGT_DATADIR=\""$(igt_tests_datadir)"\" \
>> + -DIGT_DATADIR=\""$(pkgdatadir)"\" \
>> $(LIBUNWIND_CFLAGS) \
>> $(NULL)
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index 59a06e9..4bf11bf 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -1,18 +1,3 @@
>> -igt_tests_bindir = $(pkglibexecdir)/tests
>> -igt_tests_datadir = $(pkgdatadir)/tests
>> -
>> -noinst_PROGRAMS = \
>> - $(HANG) \
>> - $(TESTS_testsuite) \
>> - $(NULL)
>> -
>> -igt_tests_bin_PROGRAMS = \
>> - gem_alive \
>> - gem_stress \
>> - $(TESTS_progs) \
>> - $(TESTS_progs_M) \
>> - $(NULL)
>> -
>> NOUVEAU_TESTS_M = \
>> prime_nv_api \
>> prime_nv_pcopy \
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-04-09 15:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-08 13:56 [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Thomas Wood
2015-04-08 13:56 ` [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data Thomas Wood
2015-04-09 6:45 ` Joonas Lahtinen
2015-04-09 12:21 ` Daniel Vetter
2015-04-09 15:56 ` Thomas Wood
2015-04-09 6:50 ` [PATCH i-g-t 1/2] tests: ensure scripts and data are included in the distribution Joonas Lahtinen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.