Message ID | 1360088274-24840-1-git-send-email-rodrigo.vivi@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Dear Rodrigo, Am Dienstag, den 05.02.2013, 16:17 -0200 schrieb Rodrigo Vivi: > Tests are still being built by default. However this request > came from OSVs in order to allow them to include i-g-t in their Please do not use abbreviations which do not even show up in the top ten hits when searching for them in the Google search engine. > distributions by default avoiding adding more and more dependencies > since we are improving and adding more and more tests. > > v2: wait for Ben's spacin fixes and adjusted for new space rules. For the subject line from `git help format-pactch`: $ git format-patch --subject-prefix="PATCH v2" > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > Conflicts: > configure.ac As it is just locale for you, you can remove this, right? > --- > Makefile.am | 6 +++++- > configure.ac | 11 ++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) […] With the changes above, Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> Thanks, Paul
At Tue, 5 Feb 2013 16:17:54 -0200, Rodrigo Vivi wrote: > > Tests are still being built by default. However this request > came from OSVs in order to allow them to include i-g-t in their > distributions by default avoiding adding more and more dependencies > since we are improving and adding more and more tests. > > v2: wait for Ben's spacin fixes and adjusted for new space rules. /spacin/spacing/ ? Reviewed-by: Takashi Iwai <tiwai@suse.de> Thanks! We can drop one more patch from SLE package now ;) Takashi > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > Conflicts: > configure.ac > --- > Makefile.am | 6 +++++- > configure.ac | 11 ++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 5ea0fd8..0dd615b 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -21,12 +21,16 @@ > > ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} > > -SUBDIRS = lib man tools scripts tests benchmarks demos > +SUBDIRS = lib man tools scripts benchmarks demos > > if BUILD_SHADER_DEBUGGER > SUBDIRS += debugger > endif > > +if BUILD_TESTS > +SUBDIRS += tests > +endif > + > test: > ${MAKE} -C tests test > > diff --git a/configure.ac b/configure.ac > index 1c56fa4..e66876c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -122,6 +122,16 @@ AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno]) > XORG_TESTSET_CFLAG([THREAD_CFLAGS], [-pthread], [-mt]) > AC_SUBST([THREAD_CFLAGS]) > > +AC_ARG_ENABLE(tests, > + AS_HELP_STRING([--disable-tests], > + [Disable tests build (default: enabled)]), > + [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"]) > +if test "x$BUILD_TESTS" = xyes; then > + AC_DEFINE(BUILD_TESTS, 1, [Build tests]) > + AC_CONFIG_FILES([tests/Makefile]) > +fi > +AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes]) > + > AC_CONFIG_FILES([ > Makefile > benchmarks/Makefile > @@ -129,7 +139,6 @@ AC_CONFIG_FILES([ > lib/Makefile > man/Makefile > scripts/Makefile > - tests/Makefile > tools/Makefile > debugger/Makefile > debugger/system_routine/Makefile > -- > 1.7.11.7 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
On Wed, Feb 06, 2013 at 12:25:16PM +0100, Takashi Iwai wrote: > At Tue, 5 Feb 2013 16:17:54 -0200, > Rodrigo Vivi wrote: > > > > Tests are still being built by default. However this request > > came from OSVs in order to allow them to include i-g-t in their > > distributions by default avoiding adding more and more dependencies > > since we are improving and adding more and more tests. > > > > v2: wait for Ben's spacin fixes and adjusted for new space rules. > > /spacin/spacing/ ? > > Reviewed-by: Takashi Iwai <tiwai@suse.de> Merged, thanks for the patch. -Daniel
diff --git a/Makefile.am b/Makefile.am index 5ea0fd8..0dd615b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,16 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -SUBDIRS = lib man tools scripts tests benchmarks demos +SUBDIRS = lib man tools scripts benchmarks demos if BUILD_SHADER_DEBUGGER SUBDIRS += debugger endif +if BUILD_TESTS +SUBDIRS += tests +endif + test: ${MAKE} -C tests test diff --git a/configure.ac b/configure.ac index 1c56fa4..e66876c 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,16 @@ AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno]) XORG_TESTSET_CFLAG([THREAD_CFLAGS], [-pthread], [-mt]) AC_SUBST([THREAD_CFLAGS]) +AC_ARG_ENABLE(tests, + AS_HELP_STRING([--disable-tests], + [Disable tests build (default: enabled)]), + [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"]) +if test "x$BUILD_TESTS" = xyes; then + AC_DEFINE(BUILD_TESTS, 1, [Build tests]) + AC_CONFIG_FILES([tests/Makefile]) +fi +AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes]) + AC_CONFIG_FILES([ Makefile benchmarks/Makefile @@ -129,7 +139,6 @@ AC_CONFIG_FILES([ lib/Makefile man/Makefile scripts/Makefile - tests/Makefile tools/Makefile debugger/Makefile debugger/system_routine/Makefile
Tests are still being built by default. However this request came from OSVs in order to allow them to include i-g-t in their distributions by default avoiding adding more and more dependencies since we are improving and adding more and more tests. v2: wait for Ben's spacin fixes and adjusted for new space rules. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Conflicts: configure.ac --- Makefile.am | 6 +++++- configure.ac | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-)