[Mesa-dev] [PATCH 8/8] fix test makefile

[Emil Velikov]

Hi Thomas,

Analogous to 7/8 please squash this with 2/8.

On 29 August 2017 at 20:56, Thomas Helland <thomashelland90 at gmail.com> wrote:
> ---
>  src/util/tests/string_buffer/Makefile.am | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/src/util/tests/string_buffer/Makefile.am b/src/util/tests/string_buffer/Makefile.am
> index 60039a90d2..fdf285fc5d 100644
> --- a/src/util/tests/string_buffer/Makefile.am
> +++ b/src/util/tests/string_buffer/Makefile.am
> @@ -23,12 +23,16 @@ AM_CPPFLAGS = \
>         -I$(top_srcdir)/src/util \
>         $(DEFINES)
>
> -LDADD = \
> +string_buffer_test_SOURCES = \
> +       append_and_print.cpp
> +
> +string_buffer_test_CFLAGS = \
> +       -I$(top_srcdir)/include \
> +       -I$(top_srcdir)/src/util \
> +       $(DEFINES) \
> +       $(PTHREAD_CFLAGS)
There's no need for the separate *CFLAGS target. Simply add the extra
bits to the AM_ one.

> +
> +string_buffer_test_LDADD = \
Correction to my earlier suggestion (still having my first coffee):
Since there's only a single target, there's no need for a separate *LDADD.

Thus adding libgtest.la to the the "generic" LDADD should ought be enough.
If you want to omit LDADD and go ahead with string_buffer_test_LDADD
that should also be fine.

>         $(top_builddir)/src/util/libmesautil.la \
>         $(PTHREAD_LIBS) \
>         $(DLOPEN_LIBS)

> -
> -TESTS = append_and_print \
> -       $()
> -
> -check_PROGRAMS = $(TESTS)
You want to keep these. Otherwise test won't be part of `make check'

-Emil