[Mesa-dev] [PATCH] i965: fix `make check` target

[Brian Paul]

On 03/18/2015 12:10 PM, Brian Paul wrote:
> On 03/18/2015 12:02 PM, Mark Janes wrote:
>> Brian Paul <brianp at vmware.com> writes:
>>
>>> On 03/18/2015 11:38 AM, Mark Janes wrote:
>>>> 4bdbb588a9d385509f9168e38bfdb76952ba469c introduced link errors for
>>>> i965 gtests.  This commit links the tests with libglapi, which
>>>> contains the missing symbols.
>>>> ---
>>>>    src/mesa/drivers/dri/i965/Makefile.am | 10 +++++++++-
>>>>    1 file changed, 9 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/src/mesa/drivers/dri/i965/Makefile.am
>>>> b/src/mesa/drivers/dri/i965/Makefile.am
>>>> index 235bcfe..f828f00 100644
>>>> --- a/src/mesa/drivers/dri/i965/Makefile.am
>>>> +++ b/src/mesa/drivers/dri/i965/Makefile.am
>>>> @@ -67,24 +67,28 @@ check_PROGRAMS = $(TESTS)
>>>>    test_fs_cmod_propagation_SOURCES = \
>>>>        test_fs_cmod_propagation.cpp
>>>>    test_fs_cmod_propagation_LDADD = \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>>        $(top_builddir)/src/gtest/libgtest.la \
>>>>        $(TEST_LIBS)
>>>>
>>>>    test_fs_saturate_propagation_SOURCES = \
>>>>        test_fs_saturate_propagation.cpp
>>>>    test_fs_saturate_propagation_LDADD = \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>>        $(top_builddir)/src/gtest/libgtest.la \
>>>>        $(TEST_LIBS)
>>>>
>>>>    test_vf_float_conversions_SOURCES = \
>>>>        test_vf_float_conversions.cpp
>>>>    test_vf_float_conversions_LDADD = \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>>        $(top_builddir)/src/gtest/libgtest.la \
>>>>        $(TEST_LIBS)
>>>>
>>>>    test_vec4_register_coalesce_SOURCES = \
>>>>        test_vec4_register_coalesce.cpp
>>>>    test_vec4_register_coalesce_LDADD = \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>>            $(top_builddir)/src/gtest/libgtest.la \
>>>>            $(TEST_LIBS)
>>>>
>>>> @@ -92,9 +96,13 @@ test_vec4_copy_propagation_SOURCES = \
>>>>        test_vec4_copy_propagation.cpp
>>>>    test_vec4_copy_propagation_LDADD = \
>>>>            $(top_builddir)/src/gtest/libgtest.la \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>>            $(TEST_LIBS)
>>>>
>>>>    test_eu_compact_SOURCES = \
>>>>        test_eu_compact.c
>>>>    nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp
>>>> -test_eu_compact_LDADD = $(TEST_LIBS)
>>>> +test_eu_compact_LDADD = \
>>>> +    $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
>>>> +    $(TEST_LIBS)
>>>> +
>>>>
>>>
>>> That doesn't seem to help when I configure/build as Vinson describes in
>>> https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D89662&d=AwIBAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=RN-S2EwBJRrqSmQexIbgPa8riYnGzrzroI2LW54zNaE&s=SfCUq3BvuYFnrXvoN58cGDU4ff8gmr0CuK5jm8cwYmE&e=
>>>
>>>
>>
>> I just built it with that configure line, and `make check` works for
>> me.  What errors do you see?
>>
>
> [...]
> make  test_fs_cmod_propagation test_fs_saturate_propagation
> test_eu_compact test_vf_float_conversions test_vec4_copy_propagation
> test_vec4_register_coalesce
> make[6]: Entering directory
> `/home/projects/Mesa/mesa/src/mesa/drivers/dri/i965'
>    CXX      test_fs_cmod_propagation.o
>    CXXLD    test_fs_cmod_propagation
> ../../../.libs/libmesa.a(context.o): In function `alloc_dispatch_table':
> /home/projects/Mesa/mesa/src/mesa/main/context.c:943: undefined
> reference to `_glapi_new_nop_table'
> /home/projects/Mesa/mesa/src/mesa/main/context.c:967: undefined
> reference to `_glapi_set_nop_handler'
> collect2: error: ld returned 1 exit status
>
>
> I did a make clean before reconfiguring and building.
>
> Still digging...

OK, I just posted a patch.  Can you test it, Mark?

-Brian