Bug 132686 – REGRESSION(CMAKE): [GTK] InputMethodFilter unit test is not built

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Carlos Garcia Campos]

Since the switch to cmake we are not building the InputMethodFilter unit test, I think this was part of the TestWebCore binary that doesn't exist anymore either.

[Carlos Garcia Campos]

Created attachment 231148 [details]
Patch

Bring it back and move it to a single binary as well.

[Martin Robinson]

Comment on attachment 231148 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=231148&action=review

> Tools/ChangeLog:9
> +        a single binary TestWebCore with the other Webcore tests. Also

Super nit: Webcore -> WebCore

> Tools/TestWebKitAPI/PlatformGTK.cmake:125
> -set(test_webcore_BINARIES
> -    LayoutUnit
> -    URL
> +add_executable(TestWebCore
> +    ${test_main_SOURCES}
> +    ${TestWebCoreGtk_SOURCES}
> +    ${TESTWEBKITAPI_DIR}/TestsController.cpp
> +    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
> +    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
>  )

I think if we are going to go our own way on all of these unit tests, we should just stop using the shared CMakeLists.txt.

> Tools/TestWebKitAPI/PlatformGTK.cmake:130
> +add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
> +set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
> +set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)

We don't need these lines unless we plan to use 'make test.'

[Carlos Garcia Campos]

(In reply to comment #2)
> (From update of attachment 231148 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=231148&action=review
> 
> > Tools/ChangeLog:9
> > +        a single binary TestWebCore with the other Webcore tests. Also
> 
> Super nit: Webcore -> WebCore

:-)

> > Tools/TestWebKitAPI/PlatformGTK.cmake:125
> > -set(test_webcore_BINARIES
> > -    LayoutUnit
> > -    URL
> > +add_executable(TestWebCore
> > +    ${test_main_SOURCES}
> > +    ${TestWebCoreGtk_SOURCES}
> > +    ${TESTWEBKITAPI_DIR}/TestsController.cpp
> > +    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
> > +    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
> >  )
> 
> I think if we are going to go our own way on all of these unit tests, we should just stop using the shared CMakeLists.txt.

No, WTF tests and the injected bundle lib for WebKit2 tests are shared in CMakeLists.txt, I would propose the other way around and move this approach to the common file, but that would be a different issue, because we were already adding those binaries in the platform specific file.

[Carlos Garcia Campos]

Created attachment 231254 [details]
Rebased patch

[Carlos Garcia Campos]

Committed r168834: <http://trac.webkit.org/changeset/168834>